Skip to content

1.35 prep #1644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

1.35 prep #1644

wants to merge 12 commits into from

Conversation

ac000
Copy link
Member

@ac000 ac000 commented Aug 26, 2025 •
edited
Loading

This is just for tagging a 1.35.0 release even though there will be no packages built...

@ac000
Copy link
Member Author

ac000 commented Aug 27, 2025

  • Update rust to 1.89.0 in docker images
  • Enable zlib, zstd & brotli in the docker images
$ git range-diff 2c43efe4...4e9de655
-:  -------- > 1:  f4c9fd91 pkg/docker: Update rust to 1.89.0
-:  -------- > 2:  be846750 pkg/docker: Enable zlib. zstd and brotli compression
1:  8de82ce7 ! 3:  49abe3f7 pkg/docker: Update dockerfiles for 1.35.0
    @@ pkg/docker/Dockerfile.go1.22 => pkg/docker/Dockerfile.go1.24
      
      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 \
     @@ pkg/docker/Dockerfile.go1.24: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.go1.24: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.go1.24: 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 \
     
      ## pkg/docker/Dockerfile.go1.23 => pkg/docker/Dockerfile.go1.25 ##
     @@
    @@ pkg/docker/Dockerfile.go1.23 => pkg/docker/Dockerfile.go1.25
      
      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 \
     @@ pkg/docker/Dockerfile.go1.25: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.go1.25: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.go1.25: 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 \
     
      ## pkg/docker/Dockerfile.jsc11 ##
     @@ pkg/docker/Dockerfile.jsc11: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.jsc11: LABEL org.opencontainers.image.url="https://unit.ng
      
      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 \
     @@ pkg/docker/Dockerfile.jsc11: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.jsc11: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.jsc11: 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 \
     
      ## pkg/docker/Dockerfile.minimal ##
     @@ pkg/docker/Dockerfile.minimal: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.minimal: LABEL org.opencontainers.image.url="https://unit.
      
      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 \
     @@ pkg/docker/Dockerfile.minimal: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.minimal: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.minimal: 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 \
     
      ## pkg/docker/Dockerfile.node20 ##
     @@ pkg/docker/Dockerfile.node20: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.node20: LABEL org.opencontainers.image.url="https://unit.n
      
      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 \
     @@ pkg/docker/Dockerfile.node20: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.node20: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.node20: 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 \
     
      ## pkg/docker/Dockerfile.node22 ##
     @@ pkg/docker/Dockerfile.node22: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.node22: LABEL org.opencontainers.image.url="https://unit.n
      
      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 \
     @@ pkg/docker/Dockerfile.node22: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.node22: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.node22: 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 \
     
      ## pkg/docker/Dockerfile.perl5.38 ##
     @@ pkg/docker/Dockerfile.perl5.38: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.perl5.38: LABEL org.opencontainers.image.url="https://unit
      
      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 \
     @@ pkg/docker/Dockerfile.perl5.38: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.perl5.38: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.perl5.38: 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 \
     
      ## pkg/docker/Dockerfile.perl5.40 ##
     @@ pkg/docker/Dockerfile.perl5.40: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.perl5.40: LABEL org.opencontainers.image.url="https://unit
      
      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 \
     @@ pkg/docker/Dockerfile.perl5.40: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.perl5.40: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.perl5.40: 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 \
     
      ## pkg/docker/Dockerfile.php8.3 ##
     @@ pkg/docker/Dockerfile.php8.3: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.php8.3: LABEL org.opencontainers.image.url="https://unit.n
      
      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 \
     @@ pkg/docker/Dockerfile.php8.3: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.php8.3: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.php8.3: 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 \
     
      ## pkg/docker/Dockerfile.php8.4 ##
     @@ pkg/docker/Dockerfile.php8.4: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.php8.4: LABEL org.opencontainers.image.url="https://unit.n
      
      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 \
     @@ pkg/docker/Dockerfile.php8.4: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.php8.4: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.php8.4: 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 \
     
      ## pkg/docker/Dockerfile.python3.12 ##
     @@ pkg/docker/Dockerfile.python3.12: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.python3.12: LABEL org.opencontainers.image.url="https://un
      
      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 \
     @@ pkg/docker/Dockerfile.python3.12: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.python3.12: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.python3.12: 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 \
     
      ## pkg/docker/Dockerfile.python3.12-slim ##
     @@ pkg/docker/Dockerfile.python3.12-slim: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.python3.12-slim: LABEL org.opencontainers.image.url="https
      
      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 \
     @@ pkg/docker/Dockerfile.python3.12-slim: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.python3.12-slim: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.python3.12-slim: 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 \
     
      ## pkg/docker/Dockerfile.python3.13 ##
     @@ pkg/docker/Dockerfile.python3.13: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.python3.13: LABEL org.opencontainers.image.url="https://un
      
      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 \
     @@ pkg/docker/Dockerfile.python3.13: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.python3.13: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.python3.13: 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 \
     
      ## pkg/docker/Dockerfile.python3.13-slim ##
     @@ pkg/docker/Dockerfile.python3.13-slim: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.python3.13-slim: LABEL org.opencontainers.image.url="https
      
      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 \
     @@ pkg/docker/Dockerfile.python3.13-slim: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.python3.13-slim: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.python3.13-slim: 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 \
     
      ## pkg/docker/Dockerfile.ruby3.3 ##
     @@ pkg/docker/Dockerfile.ruby3.3: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.ruby3.3: LABEL org.opencontainers.image.url="https://unit.
      
      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 \
     @@ pkg/docker/Dockerfile.ruby3.3: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.ruby3.3: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.ruby3.3: 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 \
     
      ## pkg/docker/Dockerfile.ruby3.2 => pkg/docker/Dockerfile.ruby3.4 ##
     @@
    @@ pkg/docker/Dockerfile.ruby3.2 => pkg/docker/Dockerfile.ruby3.4
      
      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 \
     @@ pkg/docker/Dockerfile.ruby3.4: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.ruby3.4: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.ruby3.4: 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 \
     
      ## pkg/docker/Dockerfile.wasm ##
     @@ pkg/docker/Dockerfile.wasm: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.wasm: LABEL org.opencontainers.image.url="https://unit.ngi
      
      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 \
     @@ pkg/docker/Dockerfile.wasm: RUN set -ex \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
    @@ pkg/docker/Dockerfile.wasm: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.wasm: 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 \
     
      ## pkg/docker/Makefile ##
     @@ pkg/docker/Makefile: INSTALL_minimal ?= version
2:  3fbcfde7 ! 4:  d4e3b8a1 docs/changes.xml: Add 1.35.0 changelog entries
    @@ docs/changes.xml
                      unit-wasm"
               ver="1.35.0" rev="1"
     -         date="" time=""
    -+         date="2025-08-26" time="18:00:00 +0000"
    ++         date="2025-08-27" time="18:00:00 +0000"
               packager="Nginx Packaging <[email protected]>">
      
      <change>
    @@ docs/changes.xml: NGINX Unit updated to 1.35.0.
      
      <changes apply="unit" ver="1.35.0" rev="1"
     -         date="" time=""
    -+         date="2025-08-26" time="18:00:00 +0000"
    ++         date="2025-08-27" time="18:00:00 +0000"
               packager="Nginx Packaging &lt;[email protected]&gt;">
      
     +<change type="security">
3:  2c43efe4 ! 5:  4e9de655 Add 1.35.0 CHANGES
    @@ Commit message
      ## CHANGES ##
     @@
      
    -+Changes with Unit 1.35.0                                         26 Aug 2025
    ++Changes with Unit 1.35.0                                         27 Aug 2025
     +
     +    *) Security: fix missing websocket payload length validation in the Java
     +       language module which could lead to Java language module processes

@ac000 ac000 marked this pull request as ready for review August 29, 2025 14:57
@ac000 ac000 requested review from oxpa and thresheek August 29, 2025 14:59
ac000 and others added 12 commits September 3, 2025 21:06
@ac000
Fix formatting of README.md and SUPPORT.md
b911efd 
Fixes: c30c2f5 ("Add unitctl quickstart to README.md")
Fixes: 32c91a6 ("Chnages to README and SUPPORT to reflect project change")
Signed-off-by: Andrew Clayton <[email protected]>
@ac000
.mailmap: Add entry for Dave McAllister
f99e8bc 
You can always see the original names/addresses used by passing
--no-mailmap to the various git commands.

See gitmailmap(5)

Signed-off-by: Andrew Clayton <[email protected]>
@ac000
pkg/contrib: Update to njs 0.9.1
27ba90d 
Signed-off-by: Andrew Clayton <[email protected]>
@ac000
pkg/contrib: Bump wasmtime to 35.0.0
afc9e15 
This is in preparation for the 1.35.0 release of Unit.

Signed-off-by: Andrew Clayton <[email protected]>
@ac000
tools/unitctl: Update for version 1.35.0
5a18769 
Signed-off-by: Andrew Clayton <[email protected]>
@ac000
docs/unit-openapi.yaml: Update version for 1.35.0
d94578c 
Signed-off-by: Andrew Clayton <[email protected]>
@thresheek @ac000
Docker: specify real names and handles of Maintainers
19fa55e 
Those are used for notifications from Docker Library.

Signed-off-by: Andrew Clayton <[email protected]>
@ac000
pkg/docker: Update rust to 1.89.0
b06ec78 
Signed-off-by: Andrew Clayton <[email protected]>
@ac000
pkg/docker: Enable zlib. zstd and brotli compression
2409d0f 
Install the required libraries, it also requires pkgconf.

Signed-off-by: Andrew Clayton <[email protected]>
@ac000
pkg/docker: Update dockerfiles for 1.35.0
a0a390e 
Remove Ruby 3.2 and add 3.4

Remove Golang 1.22 and 1.23, and add 1.24 and 1.25

Signed-off-by: Andrew Clayton <[email protected]>
@ac000
docs/changes.xml: Add 1.35.0 changelog entries
c090c65 
Signed-off-by: Andrew Clayton <[email protected]>
@ac000
Add 1.35.0 CHANGES
be7ecad 
This is autogenerated from docs/changes.xml by

  $ make -C docs/ changes && mv build/CHANGES .

Signed-off-by: Andrew Clayton <[email protected]>
@ac000
Copy link
Member Author

ac000 commented Sep 3, 2025

  • PHP 8.5 support.
  • OTEL crate update.
$ git range-diff 4e9de655...be7ecadf
 -:  -------- >  1:  58c27f20 otel: Bump the tracing-subscriber crate from 0.3.19 to 0.3.20
 -:  -------- >  2:  de14dc72 php: Fix building with 8.5
 1:  074ec4ca =  3:  b911efd8 Fix formatting of README.md and SUPPORT.md
 2:  f85e0a42 =  4:  f99e8bc0 .mailmap: Add entry for Dave McAllister
 3:  a63a7a39 =  5:  27ba90d4 pkg/contrib: Update to njs 0.9.1
 4:  15e9837a =  6:  afc9e15b pkg/contrib: Bump wasmtime to 35.0.0
 5:  fc1004db =  7:  5a187695 tools/unitctl: Update for version 1.35.0
 6:  b93e4363 =  8:  d94578cb docs/unit-openapi.yaml: Update version for 1.35.0
 7:  66a953d5 =  9:  19fa55e9 Docker: specify real names and handles of Maintainers
 8:  f4c9fd91 = 10:  b06ec78a pkg/docker: Update rust to 1.89.0
 9:  be846750 = 11:  2409d0f6 pkg/docker: Enable zlib. zstd and brotli compression
10:  49abe3f7 = 12:  a0a390e2 pkg/docker: Update dockerfiles for 1.35.0
11:  d4e3b8a1 ! 13:  c090c658 docs/changes.xml: Add 1.35.0 changelog entries
    @@ docs/changes.xml
                      unit-wasm"
               ver="1.35.0" rev="1"
     -         date="" time=""
    -+         date="2025-08-27" time="18:00:00 +0000"
    ++         date="2025-09-03" time="18:00:00 +0000"
               packager="Nginx Packaging &lt;[email protected]&gt;">
      
      <change>
    @@ docs/changes.xml: NGINX Unit updated to 1.35.0.
      
      <changes apply="unit" ver="1.35.0" rev="1"
     -         date="" time=""
    -+         date="2025-08-27" time="18:00:00 +0000"
    ++         date="2025-09-03" time="18:00:00 +0000"
               packager="Nginx Packaging &lt;[email protected]&gt;">
      
     +<change type="security">
    @@ docs/changes.xml: NGINX Unit updated to 1.35.0.
     +
     +<change type="feature">
     +<para>
    ++PHP 8.5 compatibility.
    ++</para>
    ++</change>
    ++
    ++<change type="feature">
    ++<para>
    ++Ruby 3.4 compatibility.
    ++</para>
    ++</change>
    ++
    ++<change type="feature">
    ++<para>
     +Django 5.x compatibility.
     +</para>
     +</change>
    @@ docs/changes.xml: NGINX Unit updated to 1.35.0.
     +</para>
     +</change>
     +
    -+<change type="feature">
    -+<para>
    -+Ruby 3.4 compatibility.
    -+</para>
    -+</change>
    -+
     +<change type="bugfix">
     +<para>
     +set SERVER_PORT to the actual value.
12:  4e9de655 ! 14:  be7ecadf Add 1.35.0 CHANGES
    @@ Commit message
      ## CHANGES ##
     @@
      
    -+Changes with Unit 1.35.0                                         27 Aug 2025
    ++Changes with Unit 1.35.0                                         03 Sep 2025
     +
     +    *) Security: fix missing websocket payload length validation in the Java
     +       language module which could lead to Java language module processes
    @@ CHANGES
     +
     +    *) Feature: HTTP compression.
     +
    ++    *) Feature: PHP 8.5 compatibility.
    ++
    ++    *) Feature: Ruby 3.4 compatibility.
    ++
     +    *) Feature: Django 5.x compatibility.
     +
     +    *) Feature: Python Litestar WebSockets compatibility.
     +
     +    *) Feature: GCC 15 compatibility.
     +
    -+    *) Feature: Ruby 3.4 compatibility.
    -+
     +    *) Bugfix: set SERVER_PORT to the actual value.
     +
     +    *) Bugfix: fix issue in node.js with duplicate headers in response.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oxpa oxpa Awaiting requested review from oxpa

@thresheek thresheek Awaiting requested review from thresheek

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ac000 @thresheek