diff options
| author | Andrew Clayton <a.clayton@nginx.com> | 2025-08-08 16:17:57 +0100 |
|---|---|---|
| committer | Andrew Clayton <a.clayton@nginx.com> | 2025-09-11 17:08:42 +0100 |
| commit | eba843e5238b2a93805c2cb5b682c896b8a16a8c (patch) | |
| tree | 0d25f56bdcebad8cd5d438082997aabe36055ebf /pkg/docker/Dockerfile.node20 | |
| parent | 2409d0f6473f94fa60cb5c7d83a0a2576391eac0 (diff) | |
| download | unit-eba843e5238b2a93805c2cb5b682c896b8a16a8c.tar.gz unit-eba843e5238b2a93805c2cb5b682c896b8a16a8c.tar.bz2 | |
pkg/docker: Update dockerfiles for 1.35.0
Remove Ruby 3.2 and add 3.4
Remove Golang 1.22 and 1.23, and add 1.24 and 1.25
Just use the main 1.35.0 tag as we aren't going to have a packaging one.
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
Diffstat (limited to 'pkg/docker/Dockerfile.node20')
| -rw-r--r-- | pkg/docker/Dockerfile.node20 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkg/docker/Dockerfile.node20 b/pkg/docker/Dockerfile.node20 index 86c3a83b..e62c56c6 100644 --- a/pkg/docker/Dockerfile.node20 +++ b/pkg/docker/Dockerfile.node20 @@ -6,14 +6,14 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org" LABEL org.opencontainers.image.source="https://github.com/nginx/unit" LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images" LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <docker-maint@nginx.com>" -LABEL org.opencontainers.image.version="1.34.0" +LABEL org.opencontainers.image.version="1.35.0" RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ - ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ + ca-certificates git build-essential libssl-dev libpcre2-dev zlib1g-dev libzstd-dev libbrotli-dev curl pkg-config pkgconf libclang-dev cmake \ + && export RUST_VERSION=1.89.0 \ && export RUSTUP_HOME=/usr/src/unit/rustup \ && export CARGO_HOME=/usr/src/unit/cargo \ && export PATH=/usr/src/unit/cargo/bin:$PATH \ @@ -35,7 +35,7 @@ RUN set -ex \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ && mkdir -p /usr/src/unit \ && cd /usr/src/unit \ - && git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \ + && git clone --depth 1 -b 1.35.0 https://github.com/nginx/unit \ && cd unit \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \ && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \ @@ -55,7 +55,10 @@ RUN set -ex \ --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --njs \ - --otel" \ + --otel \ + --zlib \ + --zstd \ + --brotli" \ && make -j $NCPU -C pkg/contrib .njs \ && export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \ && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ |