Skip to content

Commit 962752f

Browse files
ac000ac000
committed
pkg/docker: Update dockerfiles for 1.34.0
Signed-off-by: Andrew Clayton <[email protected]>
1 parent ecb0f21 commit 962752f

17 files changed

+428
-91
lines changed

‎pkg/docker/Dockerfile.go1.22

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,36 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org"
66
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
77
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
88
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
9-
LABEL org.opencontainers.image.version="1.33.0"
9+
LABEL org.opencontainers.image.version="1.34.0"
1010

1111
RUN set -ex \
1212
&& savedAptMark="$(apt-mark showmanual)" \
1313
&& apt-get update \
14-
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
14+
&& apt-get install --no-install-recommends --no-install-suggests -y \
15+
ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \
16+
&& export RUST_VERSION=1.83.0 \
17+
&& export RUSTUP_HOME=/usr/src/unit/rustup \
18+
&& export CARGO_HOME=/usr/src/unit/cargo \
19+
&& export PATH=/usr/src/unit/cargo/bin:$PATH \
20+
&& dpkgArch="$(dpkg --print-architecture)" \
21+
&& case "${dpkgArch##*-}" in \
22+
amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
23+
arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
24+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
25+
esac \
26+
&& url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
27+
&& curl -L -O "$url" \
28+
&& echo "${rustupSha256} *rustup-init" | sha256sum -c - \
29+
&& chmod +x rustup-init \
30+
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
31+
&& rm rustup-init \
32+
&& rustup --version \
33+
&& cargo --version \
34+
&& rustc --version \
1535
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
1636
&& mkdir -p /usr/src/unit \
1737
&& cd /usr/src/unit \
18-
&& git clone --depth 1 -b 1.33.0-1 https://github.com/nginx/unit \
38+
&& git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
1939
&& cd unit \
2040
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
2141
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -34,7 +54,8 @@ RUN set -ex \
3454
--openssl \
3555
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
3656
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
37-
--njs" \
57+
--njs \
58+
--otel" \
3859
&& make -j $NCPU -C pkg/contrib .njs \
3960
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
4061
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \

‎pkg/docker/Dockerfile.go1.23

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,36 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org"
66
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
77
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
88
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
9-
LABEL org.opencontainers.image.version="1.33.0"
9+
LABEL org.opencontainers.image.version="1.34.0"
1010

1111
RUN set -ex \
1212
&& savedAptMark="$(apt-mark showmanual)" \
1313
&& apt-get update \
14-
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
14+
&& apt-get install --no-install-recommends --no-install-suggests -y \
15+
ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \
16+
&& export RUST_VERSION=1.83.0 \
17+
&& export RUSTUP_HOME=/usr/src/unit/rustup \
18+
&& export CARGO_HOME=/usr/src/unit/cargo \
19+
&& export PATH=/usr/src/unit/cargo/bin:$PATH \
20+
&& dpkgArch="$(dpkg --print-architecture)" \
21+
&& case "${dpkgArch##*-}" in \
22+
amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
23+
arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
24+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
25+
esac \
26+
&& url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
27+
&& curl -L -O "$url" \
28+
&& echo "${rustupSha256} *rustup-init" | sha256sum -c - \
29+
&& chmod +x rustup-init \
30+
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
31+
&& rm rustup-init \
32+
&& rustup --version \
33+
&& cargo --version \
34+
&& rustc --version \
1535
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
1636
&& mkdir -p /usr/src/unit \
1737
&& cd /usr/src/unit \
18-
&& git clone --depth 1 -b 1.33.0-1 https://github.com/nginx/unit \
38+
&& git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
1939
&& cd unit \
2040
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
2141
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -34,7 +54,8 @@ RUN set -ex \
3454
--openssl \
3555
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
3656
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
37-
--njs" \
57+
--njs \
58+
--otel" \
3859
&& make -j $NCPU -C pkg/contrib .njs \
3960
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
4061
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \

‎pkg/docker/Dockerfile.jsc11

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,36 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org"
66
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
77
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
88
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
9-
LABEL org.opencontainers.image.version="1.33.0"
9+
LABEL org.opencontainers.image.version="1.34.0"
1010

1111
RUN set -ex \
1212
&& savedAptMark="$(apt-mark showmanual)" \
1313
&& apt-get update \
14-
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
14+
&& apt-get install --no-install-recommends --no-install-suggests -y \
15+
ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \
16+
&& export RUST_VERSION=1.83.0 \
17+
&& export RUSTUP_HOME=/usr/src/unit/rustup \
18+
&& export CARGO_HOME=/usr/src/unit/cargo \
19+
&& export PATH=/usr/src/unit/cargo/bin:$PATH \
20+
&& dpkgArch="$(dpkg --print-architecture)" \
21+
&& case "${dpkgArch##*-}" in \
22+
amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
23+
arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
24+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
25+
esac \
26+
&& url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
27+
&& curl -L -O "$url" \
28+
&& echo "${rustupSha256} *rustup-init" | sha256sum -c - \
29+
&& chmod +x rustup-init \
30+
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
31+
&& rm rustup-init \
32+
&& rustup --version \
33+
&& cargo --version \
34+
&& rustc --version \
1535
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
1636
&& mkdir -p /usr/src/unit \
1737
&& cd /usr/src/unit \
18-
&& git clone --depth 1 -b 1.33.0-1 https://github.com/nginx/unit \
38+
&& git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
1939
&& cd unit \
2040
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
2141
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -34,7 +54,8 @@ RUN set -ex \
3454
--openssl \
3555
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
3656
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
37-
--njs" \
57+
--njs \
58+
--otel" \
3859
&& make -j $NCPU -C pkg/contrib .njs \
3960
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
4061
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \

‎pkg/docker/Dockerfile.minimal

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,36 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org"
66
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
77
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
88
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
9-
LABEL org.opencontainers.image.version="1.33.0"
9+
LABEL org.opencontainers.image.version="1.34.0"
1010

1111
RUN set -ex \
1212
&& savedAptMark="$(apt-mark showmanual)" \
1313
&& apt-get update \
14-
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
14+
&& apt-get install --no-install-recommends --no-install-suggests -y \
15+
ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \
16+
&& export RUST_VERSION=1.83.0 \
17+
&& export RUSTUP_HOME=/usr/src/unit/rustup \
18+
&& export CARGO_HOME=/usr/src/unit/cargo \
19+
&& export PATH=/usr/src/unit/cargo/bin:$PATH \
20+
&& dpkgArch="$(dpkg --print-architecture)" \
21+
&& case "${dpkgArch##*-}" in \
22+
amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
23+
arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
24+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
25+
esac \
26+
&& url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
27+
&& curl -L -O "$url" \
28+
&& echo "${rustupSha256} *rustup-init" | sha256sum -c - \
29+
&& chmod +x rustup-init \
30+
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
31+
&& rm rustup-init \
32+
&& rustup --version \
33+
&& cargo --version \
34+
&& rustc --version \
1535
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
1636
&& mkdir -p /usr/src/unit \
1737
&& cd /usr/src/unit \
18-
&& git clone --depth 1 -b 1.33.0-1 https://github.com/nginx/unit \
38+
&& git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
1939
&& cd unit \
2040
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
2141
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -34,7 +54,8 @@ RUN set -ex \
3454
--openssl \
3555
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
3656
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
37-
--njs" \
57+
--njs \
58+
--otel" \
3859
&& make -j $NCPU -C pkg/contrib .njs \
3960
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
4061
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \

‎pkg/docker/Dockerfile.node20

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,36 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org"
66
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
77
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
88
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
9-
LABEL org.opencontainers.image.version="1.33.0"
9+
LABEL org.opencontainers.image.version="1.34.0"
1010

1111
RUN set -ex \
1212
&& savedAptMark="$(apt-mark showmanual)" \
1313
&& apt-get update \
14-
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
14+
&& apt-get install --no-install-recommends --no-install-suggests -y \
15+
ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \
16+
&& export RUST_VERSION=1.83.0 \
17+
&& export RUSTUP_HOME=/usr/src/unit/rustup \
18+
&& export CARGO_HOME=/usr/src/unit/cargo \
19+
&& export PATH=/usr/src/unit/cargo/bin:$PATH \
20+
&& dpkgArch="$(dpkg --print-architecture)" \
21+
&& case "${dpkgArch##*-}" in \
22+
amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
23+
arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
24+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
25+
esac \
26+
&& url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
27+
&& curl -L -O "$url" \
28+
&& echo "${rustupSha256} *rustup-init" | sha256sum -c - \
29+
&& chmod +x rustup-init \
30+
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
31+
&& rm rustup-init \
32+
&& rustup --version \
33+
&& cargo --version \
34+
&& rustc --version \
1535
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
1636
&& mkdir -p /usr/src/unit \
1737
&& cd /usr/src/unit \
18-
&& git clone --depth 1 -b 1.33.0-1 https://github.com/nginx/unit \
38+
&& git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
1939
&& cd unit \
2040
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
2141
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -34,7 +54,8 @@ RUN set -ex \
3454
--openssl \
3555
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
3656
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
37-
--njs" \
57+
--njs \
58+
--otel" \
3859
&& make -j $NCPU -C pkg/contrib .njs \
3960
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
4061
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \

‎pkg/docker/Dockerfile.node22

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,36 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org"
66
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
77
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
88
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
9-
LABEL org.opencontainers.image.version="1.33.0"
9+
LABEL org.opencontainers.image.version="1.34.0"
1010

1111
RUN set -ex \
1212
&& savedAptMark="$(apt-mark showmanual)" \
1313
&& apt-get update \
14-
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
14+
&& apt-get install --no-install-recommends --no-install-suggests -y \
15+
ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \
16+
&& export RUST_VERSION=1.83.0 \
17+
&& export RUSTUP_HOME=/usr/src/unit/rustup \
18+
&& export CARGO_HOME=/usr/src/unit/cargo \
19+
&& export PATH=/usr/src/unit/cargo/bin:$PATH \
20+
&& dpkgArch="$(dpkg --print-architecture)" \
21+
&& case "${dpkgArch##*-}" in \
22+
amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
23+
arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
24+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
25+
esac \
26+
&& url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
27+
&& curl -L -O "$url" \
28+
&& echo "${rustupSha256} *rustup-init" | sha256sum -c - \
29+
&& chmod +x rustup-init \
30+
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
31+
&& rm rustup-init \
32+
&& rustup --version \
33+
&& cargo --version \
34+
&& rustc --version \
1535
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
1636
&& mkdir -p /usr/src/unit \
1737
&& cd /usr/src/unit \
18-
&& git clone --depth 1 -b 1.33.0-1 https://github.com/nginx/unit \
38+
&& git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
1939
&& cd unit \
2040
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
2141
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -34,7 +54,8 @@ RUN set -ex \
3454
--openssl \
3555
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
3656
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
37-
--njs" \
57+
--njs \
58+
--otel" \
3859
&& make -j $NCPU -C pkg/contrib .njs \
3960
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
4061
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \

‎pkg/docker/Dockerfile.perl5.38

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,36 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org"
66
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
77
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
88
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
9-
LABEL org.opencontainers.image.version="1.33.0"
9+
LABEL org.opencontainers.image.version="1.34.0"
1010

1111
RUN set -ex \
1212
&& savedAptMark="$(apt-mark showmanual)" \
1313
&& apt-get update \
14-
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \
14+
&& apt-get install --no-install-recommends --no-install-suggests -y \
15+
ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \
16+
&& export RUST_VERSION=1.83.0 \
17+
&& export RUSTUP_HOME=/usr/src/unit/rustup \
18+
&& export CARGO_HOME=/usr/src/unit/cargo \
19+
&& export PATH=/usr/src/unit/cargo/bin:$PATH \
20+
&& dpkgArch="$(dpkg --print-architecture)" \
21+
&& case "${dpkgArch##*-}" in \
22+
amd64) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \
23+
arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \
24+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
25+
esac \
26+
&& url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" \
27+
&& curl -L -O "$url" \
28+
&& echo "${rustupSha256} *rustup-init" | sha256sum -c - \
29+
&& chmod +x rustup-init \
30+
&& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} \
31+
&& rm rustup-init \
32+
&& rustup --version \
33+
&& cargo --version \
34+
&& rustc --version \
1535
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
1636
&& mkdir -p /usr/src/unit \
1737
&& cd /usr/src/unit \
18-
&& git clone --depth 1 -b 1.33.0-1 https://github.com/nginx/unit \
38+
&& git clone --depth 1 -b 1.34.0-1 https://github.com/nginx/unit \
1939
&& cd unit \
2040
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
2141
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -34,7 +54,8 @@ RUN set -ex \
3454
--openssl \
3555
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
3656
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
37-
--njs" \
57+
--njs \
58+
--otel" \
3859
&& make -j $NCPU -C pkg/contrib .njs \
3960
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
4061
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \

0 commit comments

Comments
 (0)