Skip to content
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

1.34.0 Release Preparations #1508

Merged
merged 6 commits into from
Dec 19, 2024
Merged

1.34.0 Release Preparations #1508

merged 6 commits into from
Dec 19, 2024

Conversation

ac000
Copy link
Member

@ac000 ac000 commented Dec 12, 2024

This is a preparatory branch for the 1.34.0 release.

@ac000
Copy link
Member Author

ac000 commented Dec 13, 2024

  • changes tweak
$ git range-diff ce009fcc...079d6fc2
1:  8f51aede ! 1:  cd92fe7c docs/changes.xml: Add 1.34.0 changelog entries
    @@ docs/changes.xml: NGINX Unit updated to 1.34.0.
      
     +<change type="feature">
     +<para>
    -+initial OpenTelemetry (OTEL) support.
    ++initial OpenTelemetry (OTEL) support. (Disabled by default).
     +</para>
     +</change>
     +
2:  ce009fcc ! 2:  079d6fc2 Add 1.34.0 CHANGES
    @@ CHANGES
      
     +Changes with Unit 1.34.0                                         19 Dec 2024
     +
    -+    *) Feature: initial OpenTelemetry (OTEL) support.
    ++    *) Feature: initial OpenTelemetry (OTEL) support. (Disabled by default).
     +
     +    *) Feature: support for JSON formatted access logs.
     +

@ac000
Copy link
Member Author

ac000 commented Dec 18, 2024

  • Rebased with master
  • Regenerated dockerfiles
$ git range-diff --creation-factor=100 079d6fc2...889358ea
 -:  -------- >  1:  9e98a7e5 Docker: update Python and PHP versions
 -:  -------- >  2:  655ca61b Packages: support rpm 4.20+
 -:  -------- >  3:  19f403f5 Packages: add Fedora 41 support
 -:  -------- >  4:  ae20ab0a auto/otel: Remove pkg-config check
 -:  -------- >  5:  f5371e95 wasm-wc: Update to wasmtime 27.0.0
 -:  -------- >  6:  0959ff0b otel: Update crates
 -:  -------- >  7:  b9b3ef03 tools/unitctl: Update crates
 -:  -------- >  8:  e812f15f wasm-wc: Update crates
 -:  -------- >  9:  175f6b0b contrib: update njs to 0.8.8
 -:  -------- > 10:  326865b2 contrib: update wasmtime to 27.0.0
 -:  -------- > 11:  6f9954bd Packages: enable otel support
 -:  -------- > 12:  62129373 Docker: enable otel and fix build with wasmtime 24+
 -:  -------- > 13:  551df9bb Docker: renamed branch to fetch from after successfull hg->git migration
 -:  -------- > 14:  0d0b87f1 .mailmap: Add an entry for Igor
 1:  c0ff2973 ! 15:  e2120a28 tools/unitctl: Update for version 1.34.0
    @@ Commit message
         Signed-off-by: Andrew Clayton <[email protected]>
     
      ## tools/unitctl/Cargo.lock ##
    -@@ tools/unitctl/Cargo.lock: dependencies = [
    +@@ tools/unitctl/Cargo.lock: checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
      
      [[package]]
      name = "unit-client-rs"
    @@ tools/unitctl/Cargo.lock: dependencies = [
     -version = "1.33.0"
     +version = "1.34.0"
      dependencies = [
    -  "base64 0.21.5",
    +  "base64 0.21.7",
       "futures",
     @@ tools/unitctl/Cargo.lock: dependencies = [
      
 2:  c5170b09 = 16:  37d76f3a docs/unit-openapi.yaml: Update version for 1.34.0
 3:  ba63e31a ! 17:  4ec56502 pkg/docker: Update dockerfiles for 1.34.0
    @@ pkg/docker/Dockerfile.go1.22: LABEL org.opencontainers.image.url="https://unit.n
      
      RUN set -ex \
          && savedAptMark="$(apt-mark showmanual)" \
    -@@ pkg/docker/Dockerfile.go1.22: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /usr/src/unit \
    @@ pkg/docker/Dockerfile.go1.22: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.go1.22: RUN set -ex \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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.23: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.go1.23: LABEL org.opencontainers.image.url="https://unit.n
      
      RUN set -ex \
          && savedAptMark="$(apt-mark showmanual)" \
    -@@ pkg/docker/Dockerfile.go1.23: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /usr/src/unit \
    @@ pkg/docker/Dockerfile.go1.23: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.go1.23: RUN set -ex \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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)" \
    -@@ pkg/docker/Dockerfile.jsc11: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /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 \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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)" \
    -@@ pkg/docker/Dockerfile.minimal: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /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 \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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)" \
    -@@ pkg/docker/Dockerfile.node20: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /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 \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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)" \
    -@@ pkg/docker/Dockerfile.node22: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /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 \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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)" \
    -@@ pkg/docker/Dockerfile.perl5.38: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /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 \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
    +     && 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.33.0-1 https://github.com/nginx/unit \
    ++    && git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
    +     && cd unit \
    +     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
    +     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
     @@ pkg/docker/Dockerfile.perl5.40: 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.33.0-1 https://github.com/nginx/unit \
    -+    && git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
    -     && cd unit \
    -     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
    -     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    -
    - ## pkg/docker/Dockerfile.php8.2 ##
    -@@ pkg/docker/Dockerfile.php8.2: 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 <[email protected]>"
    --LABEL org.opencontainers.image.version="1.33.0"
    -+LABEL org.opencontainers.image.version="1.34.0"
    - 
    - RUN set -ex \
    -     && savedAptMark="$(apt-mark showmanual)" \
    -@@ pkg/docker/Dockerfile.php8.2: 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.33.0-1 https://github.com/nginx/unit \
    -+    && git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
    -     && cd unit \
    -     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
    -     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
    +     && 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.33.0-1 https://github.com/nginx/unit \
    ++    && git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
    +     && cd unit \
    +     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
    +     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
     @@ pkg/docker/Dockerfile.php8.3: 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.33.0-1 https://github.com/nginx/unit \
    -+    && git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
    -     && cd unit \
    -     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
    -     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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.11 ##
    -@@ pkg/docker/Dockerfile.python3.11: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    + ## pkg/docker/Dockerfile.php8.4 ##
    +@@ pkg/docker/Dockerfile.php8.4: 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 <[email protected]>"
    @@ pkg/docker/Dockerfile.python3.11: LABEL org.opencontainers.image.url="https://un
      
      RUN set -ex \
          && savedAptMark="$(apt-mark showmanual)" \
    -@@ pkg/docker/Dockerfile.python3.11: 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.33.0-1 https://github.com/nginx/unit \
    -+    && git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
    -     && cd unit \
    -     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
    -     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    -
    - ## pkg/docker/Dockerfile.python3.11-slim ##
    -@@ pkg/docker/Dockerfile.python3.11-slim: 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 <[email protected]>"
    --LABEL org.opencontainers.image.version="1.33.0"
    -+LABEL org.opencontainers.image.version="1.34.0"
    - 
    - RUN set -ex \
    -     && savedAptMark="$(apt-mark showmanual)" \
    -@@ pkg/docker/Dockerfile.python3.11-slim: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /usr/src/unit \
    @@ pkg/docker/Dockerfile.python3.11-slim: 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 \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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)" \
    -@@ pkg/docker/Dockerfile.python3.12: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /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 \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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)" \
    -@@ pkg/docker/Dockerfile.python3.12-slim: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /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 \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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"
    + 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 <[email protected]>"
    +-LABEL org.opencontainers.image.version="1.33.0"
    ++LABEL org.opencontainers.image.version="1.34.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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
    +     && 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.33.0-1 https://github.com/nginx/unit \
    ++    && git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
    +     && cd unit \
    +     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
    +     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.python3.13: RUN set -ex \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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"
    + 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 <[email protected]>"
    +-LABEL org.opencontainers.image.version="1.33.0"
    ++LABEL org.opencontainers.image.version="1.34.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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
    +     && 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.33.0-1 https://github.com/nginx/unit \
    ++    && git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
    +     && cd unit \
    +     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
    +     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.python3.13-slim: RUN set -ex \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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.2: LABEL org.opencontainers.image.url="https://unit.nginx.org"
    @@ pkg/docker/Dockerfile.ruby3.2: LABEL org.opencontainers.image.url="https://unit.
      
      RUN set -ex \
          && savedAptMark="$(apt-mark showmanual)" \
    -@@ pkg/docker/Dockerfile.ruby3.2: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /usr/src/unit \
    @@ pkg/docker/Dockerfile.ruby3.2: RUN set -ex \
          && cd unit \
          && NCPU="$(getconf _NPROCESSORS_ONLN)" \
          && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
    +@@ pkg/docker/Dockerfile.ruby3.2: RUN set -ex \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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)" \
    -@@ pkg/docker/Dockerfile.ruby3.3: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /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 \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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)" \
    -@@ pkg/docker/Dockerfile.wasm: RUN set -ex \
    +     && 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 \
    ++    && 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.80.1 \
    ++    && export RUSTUP_HOME=/usr/src/unit/rustup \
    ++    && export CARGO_HOME=/usr/src/unit/cargo \
    ++    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    ++    && dpkgArch="$(dpkg --print-architecture)" \
    ++    && case "${dpkgArch##*-}" in \
    ++         amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    ++         arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    ++         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    ++       esac \
    ++    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    ++    && curl -L -O "$url" \
    ++    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    ++    && chmod +x rustup-init \
    ++    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    ++    && rm rustup-init \
    ++    && rustup --version \
    ++    && cargo --version \
    ++    && rustc --version \
          && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
          && mkdir -p /usr/src/unit \
          && cd /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 \
    +                 --openssl \
    +                 --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
    +     && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
    +-                --njs" \
    ++                --njs \
    ++                --otel" \
    +     && 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: RUN set -ex \
    +     && make -j $NCPU unitd \
    +     && install -pm755 build/sbin/unitd /usr/sbin/unitd \
    +     && make clean \
    +-    && apt-get install --no-install-recommends --no-install-suggests -y libclang-dev \
    +-    && export RUST_VERSION=1.80.1 \
    +-    && export RUSTUP_HOME=/usr/src/unit/rustup \
    +-    && export CARGO_HOME=/usr/src/unit/cargo \
    +-    && export PATH=/usr/src/unit/cargo/bin:$PATH \
    +-    && dpkgArch="$(dpkg --print-architecture)" \
    +-    && case "${dpkgArch##*-}" in \
    +-       amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
    +-       arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
    +-       *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
    +-    esac \
    +-    && url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
    +-    && curl -L -O "$url" \
    +-    && echo "${rustupSha256} *rustup-init" | sha256sum -c - \
    +-    && chmod +x rustup-init \
    +-    && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
    +-    && rm rustup-init \
    +-    && rustup --version \
    +-    && cargo --version \
    +-    && rustc --version \
    +     && make -C pkg/contrib .wasmtime \
    +-    && install -pm 755 pkg/contrib/wasmtime/target/release/libwasmtime.so /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ \
    ++    && install -pm 755 pkg/contrib/wasmtime/artifacts/lib/libwasmtime.so /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ \
    +     && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
    +-    && ./configure wasm --include-path=`pwd`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=/usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ && ./configure wasm-wasi-component \
    ++    && ./configure wasm --include-path=`pwd`/pkg/contrib/wasmtime/artifacts/include --lib-path=/usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ && ./configure wasm-wasi-component \
    +     && make -j $NCPU wasm-install wasm-wasi-component-install \
    +     && make clean \
    +     && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
    +-    && ./configure wasm --include-path=`pwd`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=/usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ && ./configure wasm-wasi-component \
    ++    && ./configure wasm --include-path=`pwd`/pkg/contrib/wasmtime/artifacts/include --lib-path=/usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ && ./configure wasm-wasi-component \
    +     && make -j $NCPU wasm-install wasm-wasi-component-install \
    +     && cd \
    +     && rm -rf /usr/src/unit \
 4:  cd92fe7c ! 18:  2c5e272f docs/changes.xml: Add 1.34.0 changelog entries
    @@ docs/changes.xml
                      unit-wasm"
               ver="1.34.0" rev="1"
     -         date="" time=""
    -+         date="2024-12-19" time="18:00:00 +0000"
    ++         date="2024-12-18" time="18:00:00 +0000"
               packager="Nginx Packaging &lt;[email protected]&gt;">
      
      <change>
    @@ docs/changes.xml: NGINX Unit updated to 1.34.0.
      
      <changes apply="unit" ver="1.34.0" rev="1"
     -         date="" time=""
    -+         date="2024-12-19" time="18:00:00 +0000"
    ++         date="2024-12-18" time="18:00:00 +0000"
               packager="Nginx Packaging &lt;[email protected]&gt;">
      
     +<change type="feature">
 5:  079d6fc2 ! 19:  889358ea Add 1.34.0 CHANGES
    @@ Commit message
      ## CHANGES ##
     @@
      
    -+Changes with Unit 1.34.0                                         19 Dec 2024
    ++Changes with Unit 1.34.0                                         18 Dec 2024
     +
     +    *) Feature: initial OpenTelemetry (OTEL) support. (Disabled by default).
     +

@ac000
Copy link
Member Author

ac000 commented Dec 18, 2024

@thresheek if you want to give the docker stuff a quick look...

@oxpa if you want to ACK your .mailmap entry. Or if you want your name to show differently or a different email address...

@thresheek
Copy link
Member

Yep, checking docker & packaging from this branch now.

@thresheek
Copy link
Member

It looks like we need another bump of Rust toolchain in the Dockerfiles:

328.9 error: rustc 1.80.1 is not supported by the following package:
328.9   [email protected] requires rustc 1.81
328.9 Either upgrade rustc or select compatible dependency versions with
328.9 `cargo update <name>@<current-ver> --precise <compatible-ver>`
328.9 where `<compatible-ver>` is the latest version supporting rustc 1.80.1
328.9
329.0 make: *** [build/Makefile:2237: src/wasm-wasi-component/target/release/libwasm_wasi_component.so] Error 101

@ac000
Copy link
Member Author

ac000 commented Dec 18, 2024

Hmm, why aren't we just using whatever the latest version from rustup is?

@thresheek
Copy link
Member

It's nice to have repeatable results.

@thresheek
Copy link
Member

Docker Rust version bump PR submitted: #1517

ac000 added 4 commits December 18, 2024 23:02
@ac000
.mailmap: Add an entry for Igor
1b88304 
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
tools/unitctl: Update for version 1.34.0
fe9be6c 
Signed-off-by: Andrew Clayton <[email protected]>
@ac000
docs/unit-openapi.yaml: Update version for 1.34.0
ecb0f21 
Signed-off-by: Andrew Clayton <[email protected]>
@ac000
pkg/docker: Update dockerfiles for 1.34.0
962752f 
Signed-off-by: Andrew Clayton <[email protected]>
@ac000
Copy link
Member Author

ac000 commented Dec 18, 2024

  • Rebased with master
  • Regenerated dockerfiles
$ git range-diff 889358ea...0b55c8c5
-:  -------- > 1:  a1102295 Docker: update Rust version
1:  0d0b87f1 = 2:  1b88304f .mailmap: Add an entry for Igor
2:  e2120a28 = 3:  fe9be6cd tools/unitctl: Update for version 1.34.0
3:  37d76f3a = 4:  ecb0f21d docs/unit-openapi.yaml: Update version for 1.34.0
4:  4ec56502 ! 5:  962752f5 pkg/docker: Update dockerfiles for 1.34.0
    @@ pkg/docker/Dockerfile.go1.22: LABEL org.opencontainers.image.url="https://unit.n
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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.23: LABEL org.opencontainers.image.url="https://unit.n
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://unit.ng
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://unit.
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://unit.n
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://unit.n
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://unit
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://unit
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://unit.n
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://unit.n
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://un
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://un
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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.2: LABEL org.opencontainers.image.url="https://unit.
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://unit.
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.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: LABEL org.opencontainers.image.url="https://unit.ngi
     -    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
     +    && 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.80.1 \
    ++    && export RUST_VERSION=1.83.0 \
     +    && export RUSTUP_HOME=/usr/src/unit/rustup \
     +    && export CARGO_HOME=/usr/src/unit/cargo \
     +    && export PATH=/usr/src/unit/cargo/bin:$PATH \
5:  2c5e272f = 6:  715d4654 docs/changes.xml: Add 1.34.0 changelog entries
6:  889358ea = 7:  0b55c8c5 Add 1.34.0 CHANGES

@ac000
Copy link
Member Author

ac000 commented Dec 18, 2024

@thresheek dockerfiles regenerated...

@thresheek
Copy link
Member

Thanks! Both packages and docker builds now pass.

Looks good to me!

ac000 added 2 commits December 19, 2024 01:29
@ac000
docs/changes.xml: Add 1.34.0 changelog entries
5a28c66 
Signed-off-by: Andrew Clayton <[email protected]>
@ac000
Add 1.34.0 CHANGES
27bde18 
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 Dec 19, 2024

Update release date

$ git range-diff 0b55c8c5...27bde184
1:  715d4654 ! 1:  5a28c663 docs/changes.xml: Add 1.34.0 changelog entries
    @@ Commit message
         Signed-off-by: Andrew Clayton <[email protected]>
     
      ## docs/changes.xml ##
    +@@
    +                 unit-python unit-python2.7
    +                 unit-python3.4 unit-python3.5 unit-python3.6 unit-python3.7
    +                 unit-python3.8 unit-python3.9 unit-python3.10 unit-python3.11
    +-                unit-python3.12
    ++                unit-python3.12 unit-python3.13
    +                 unit-go
    +                 unit-perl
    +                 unit-ruby
     @@
                      unit-jsc19 unit-jsc20 unit-jsc21
                      unit-wasm"
               ver="1.34.0" rev="1"
     -         date="" time=""
    -+         date="2024-12-18" time="18:00:00 +0000"
    ++         date="2024-12-19" time="18:00:00 +0000"
               packager="Nginx Packaging &lt;[email protected]&gt;">
      
      <change>
    @@ docs/changes.xml: NGINX Unit updated to 1.34.0.
      
      <changes apply="unit" ver="1.34.0" rev="1"
     -         date="" time=""
    -+         date="2024-12-18" time="18:00:00 +0000"
    ++         date="2024-12-19" time="18:00:00 +0000"
               packager="Nginx Packaging &lt;[email protected]&gt;">
      
     +<change type="feature">
2:  0b55c8c5 ! 2:  27bde184 Add 1.34.0 CHANGES
    @@ Commit message
      ## CHANGES ##
     @@
      
    -+Changes with Unit 1.34.0                                         18 Dec 2024
    ++Changes with Unit 1.34.0                                         19 Dec 2024
     +
     +    *) Feature: initial OpenTelemetry (OTEL) support. (Disabled by default).
     +

@ac000 ac000 marked this pull request as ready for review December 19, 2024 01:32
@ac000 ac000 requested a review from callahad December 19, 2024 01:33
callahad
callahad approved these changes Dec 19, 2024
View reviewed changes
Copy link
Collaborator

@callahad callahad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@ac000 ac000 merged commit 27bde18 into nginx:master Dec 19, 2024
8 checks passed
@ac000 ac000 deleted the 1.34-prep branch December 19, 2024 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@callahad callahad callahad approved these changes

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

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