-
Notifications
You must be signed in to change notification settings - Fork 337
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pkg/docker: Update dockerfiles for 1.34.0
Signed-off-by: Andrew Clayton <[email protected]>
- Loading branch information
Showing
17 changed files
with
428 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,16 +6,36 @@ 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.83.0 \ | ||
&& 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)" \ | ||
|
@@ -34,7 +54,8 @@ 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 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,16 +6,36 @@ 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.83.0 \ | ||
&& 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)" \ | ||
|
@@ -34,7 +54,8 @@ 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 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,16 +6,36 @@ 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.83.0 \ | ||
&& 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)" \ | ||
|
@@ -34,7 +54,8 @@ 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 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,16 +6,36 @@ 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.83.0 \ | ||
&& 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)" \ | ||
|
@@ -34,7 +54,8 @@ 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 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,16 +6,36 @@ 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.83.0 \ | ||
&& 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)" \ | ||
|
@@ -34,7 +54,8 @@ 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 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,16 +6,36 @@ 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.83.0 \ | ||
&& 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)" \ | ||
|
@@ -34,7 +54,8 @@ 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 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,16 +6,36 @@ 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.83.0 \ | ||
&& 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)" \ | ||
|
@@ -34,7 +54,8 @@ 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 \ | ||
|
Oops, something went wrong.