Skip to content

Commit 90a6ddd

Browse files
committed
Image is now based on Alpine 3.18.
1 parent df96b4a commit 90a6ddd

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

Dockerfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ ARG LIBMAXMINDDB_URL=https://github.com/maxmind/libmaxminddb/releases/download/$
2424
FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx
2525

2626
# Get Python cryptography wheel. It is needed for certbot.
27-
FROM moonbuggy2000/python-musl-wheels:cryptography41.0.3-py3.10-${TARGETARCH}${TARGETVARIANT} AS mod_cryptography
27+
FROM moonbuggy2000/python-musl-wheels:cryptography43.0.0-py3.11-${TARGETARCH}${TARGETVARIANT} AS mod_cryptography
2828

2929
# Build UPX.
30-
FROM --platform=$BUILDPLATFORM alpine:3.16 AS upx
30+
FROM --platform=$BUILDPLATFORM alpine:3.18 AS upx
3131
RUN apk --no-cache add build-base curl make cmake git && \
3232
mkdir /tmp/upx && \
3333
curl -# -L https://github.com/upx/upx/releases/download/v4.0.1/upx-4.0.1-src.tar.xz | tar xJ --strip 1 -C /tmp/upx && \
3434
make -C /tmp/upx build/release-gcc -j$(nproc) && \
3535
cp -v /tmp/upx/build/release-gcc/upx /usr/bin/upx
3636

3737
# Build Nginx Proxy Manager.
38-
FROM --platform=$BUILDPLATFORM alpine:3.16 AS npm
38+
FROM --platform=$BUILDPLATFORM alpine:3.18 AS npm
3939
ARG TARGETPLATFORM
4040
ARG NGINX_PROXY_MANAGER_VERSION
4141
ARG NGINX_PROXY_MANAGER_URL
@@ -44,7 +44,7 @@ COPY src/nginx-proxy-manager /build
4444
RUN /build/build.sh "$NGINX_PROXY_MANAGER_VERSION" "$NGINX_PROXY_MANAGER_URL"
4545

4646
# Build OpenResty (nginx).
47-
FROM --platform=$BUILDPLATFORM alpine:3.16 AS nginx
47+
FROM --platform=$BUILDPLATFORM alpine:3.18 AS nginx
4848
ARG TARGETPLATFORM
4949
ARG OPENRESTY_URL
5050
ARG NGINX_HTTP_GEOIP2_MODULE_URL
@@ -55,7 +55,7 @@ RUN /build/build.sh "$OPENRESTY_URL" "$NGINX_HTTP_GEOIP2_MODULE_URL" "$LIBMAXMIN
5555
RUN xx-verify /tmp/openresty-install/usr/sbin/nginx
5656

5757
# Build bcrypt-tool.
58-
FROM --platform=$BUILDPLATFORM alpine:3.16 AS bcrypt-tool
58+
FROM --platform=$BUILDPLATFORM alpine:3.18 AS bcrypt-tool
5959
ARG TARGETPLATFORM
6060
ARG BCRYPT_TOOL_VERSION
6161
COPY --from=xx / /
@@ -66,20 +66,20 @@ COPY --from=upx /usr/bin/upx /usr/bin/upx
6666
RUN upx /tmp/go/bin/bcrypt-tool
6767

6868
# Build certbot.
69-
FROM alpine:3.16 AS certbot
69+
FROM alpine:3.18 AS certbot
7070
COPY --from=mod_cryptography / /wheels
7171
RUN \
7272
apk --no-cache add build-base curl python3 && \
7373
curl -# -L "https://bootstrap.pypa.io/get-pip.py" | python3 && \
7474
pip install --no-cache-dir --root=/tmp/certbot-install --prefix=/usr --find-links /wheels/ --prefer-binary --only-binary=:all: certbot && \
75-
find /tmp/certbot-install/usr/lib/python3.10/site-packages -type f -name "*.so" -exec strip {} ';' && \
76-
find /tmp/certbot-install/usr/lib/python3.10/site-packages -type f -name "*.h" -delete && \
77-
find /tmp/certbot-install/usr/lib/python3.10/site-packages -type f -name "*.c" -delete && \
78-
find /tmp/certbot-install/usr/lib/python3.10/site-packages -type f -name "*.exe" -delete && \
79-
find /tmp/certbot-install/usr/lib/python3.10/site-packages -type d -name tests -print0 | xargs -0 rm -r
75+
find /tmp/certbot-install/usr/lib/python3.11/site-packages -type f -name "*.so" -exec strip {} ';' && \
76+
find /tmp/certbot-install/usr/lib/python3.11/site-packages -type f -name "*.h" -delete && \
77+
find /tmp/certbot-install/usr/lib/python3.11/site-packages -type f -name "*.c" -delete && \
78+
find /tmp/certbot-install/usr/lib/python3.11/site-packages -type f -name "*.exe" -delete && \
79+
find /tmp/certbot-install/usr/lib/python3.11/site-packages -type d -name tests -print0 | xargs -0 rm -r
8080

8181
# Pull base image.
82-
FROM jlesage/baseimage:alpine-3.16-v3.6.5
82+
FROM jlesage/baseimage:alpine-3.18-v3.6.5
8383

8484
ARG NGINX_PROXY_MANAGER_VERSION
8585
ARG DOCKER_IMAGE_VERSION

src/nginx-proxy-manager/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ cp -r /tmp/nginx-proxy-manager /app
8787

8888
log "Building Nginx Proxy Manager frontend..."
8989
(
90+
export NODE_OPTIONS=--openssl-legacy-provider
9091
cd /app/frontend
9192
yarn install --network-timeout 100000
9293
yarn build

0 commit comments

Comments
 (0)