diff options
| author | Andrei Belov <defan@nginx.com> | 2021-11-18 17:04:04 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2021-11-18 17:04:04 +0300 |
| commit | b400ccd1aa8eeb6a5de1707e0bb8c3d417fe69b7 (patch) | |
| tree | 60ff49ffc16ef7cb3aad1beb2d78f051a8794cdf /pkg/docker/Dockerfile.minimal | |
| parent | fafd44166d9e835e91a4c5668048308ce99a62bd (diff) | |
| parent | b77895d1c7d6cd4826ac7427c91baa95b998a912 (diff) | |
| download | unit-b400ccd1aa8eeb6a5de1707e0bb8c3d417fe69b7.tar.gz unit-b400ccd1aa8eeb6a5de1707e0bb8c3d417fe69b7.tar.bz2 | |
Merged with the default branch.1.26.0-1
Diffstat (limited to 'pkg/docker/Dockerfile.minimal')
| -rw-r--r-- | pkg/docker/Dockerfile.minimal | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal index 00875732..18c02898 100644 --- a/pkg/docker/Dockerfile.minimal +++ b/pkg/docker/Dockerfile.minimal @@ -1,4 +1,4 @@ -FROM debian:buster-slim as BUILDER +FROM debian:bullseye-slim as BUILDER LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" @@ -8,7 +8,7 @@ RUN set -ex \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ && hg clone https://hg.nginx.org/unit \ && cd unit \ - && hg up 1.25.0 \ + && hg up 1.26.0 \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \ && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \ && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \ @@ -40,7 +40,7 @@ RUN set -ex \ && make -j $NCPU version \ && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt -FROM debian:buster-slim +FROM debian:bullseye-slim COPY docker-entrypoint.sh /usr/local/bin/ COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug |