From 1bfcec74ce2c7329cfef7a1c5c67a85a88c01f1f Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 30 Dec 2024 23:27:17 +0000 Subject: [PATCH 1/6] Docker: mount rust from image at build time instead of downloading it This ensures that rust is not left behind in the image --- pkg/docker/template.Dockerfile | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/pkg/docker/template.Dockerfile b/pkg/docker/template.Dockerfile index 3d2c38849..fe769bb22 100644 --- a/pkg/docker/template.Dockerfile +++ b/pkg/docker/template.Dockerfile @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm as rust-build + FROM @@CONTAINER@@ LABEL org.opencontainers.image.title="Unit (@@MODULE@@)" @@ -8,30 +10,16 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="@@VERSION@@" -RUN set -ex \ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ From 163e7f66b478e4145fa8df55ff809ecb479b4398 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Mon, 30 Dec 2024 23:44:36 +0000 Subject: [PATCH 2/6] Docker: avoid build duplication between the images Instead of rebuilding unitd binaries every time a module image is built, copy them from the minimal image. --- pkg/docker/Makefile | 35 ++++++++++++++++++++++++++++++++++ pkg/docker/template.Dockerfile | 20 ++----------------- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 23401e7ee..2b01b4658 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -19,6 +19,8 @@ CONFIGURE_minimal ?= INSTALL_minimal ?= version RUN_minimal ?= /bin/true MODULE_PREBUILD_minimal ?= /bin/true +COPY_STEP_minimal = +BUILD_STEP_minimal = $(BUILD_UNITD) VERSIONS_go ?= 1.22 1.23 VARIANT_go ?= $(VARIANT) @@ -88,6 +90,37 @@ make -C pkg/contrib .wasmtime \\\n \ \ \ \ \&\& install -pm 755 pkg/contrib/wasmtime/artifacts/lib/libwasmtime.so /usr/lib/\$$\(dpkg-architecture -q DEB_HOST_MULTIARCH\)/ endef +define BUILD_UNITD +make -j $$NCPU -C pkg/contrib .njs \\\n \ +\ \ \ \&\& export PKG_CONFIG_PATH=\$$\(pwd\)/pkg/contrib/njs/build \\\n \ +\ \ \ \&\& ./configure $$CONFIGURE_ARGS --cc-opt="$$CC_OPT" --ld-opt="$$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \\\n \ +\ \ \ \&\& make -j $$NCPU unitd \\\n \ +\ \ \ \&\& install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \\\n \ +\ \ \ \&\& make clean \\\n \ +\ \ \ \&\& ./configure $$CONFIGURE_ARGS --cc-opt="$$CC_OPT" --ld-opt="$$LD_OPT" --modulesdir=/usr/lib/unit/modules \\\n \ +\ \ \ \&\& make -j $$NCPU unitd \\\n \ +\ \ \ \&\& install -pm755 build/sbin/unitd /usr/sbin/unitd \\\n \ +\ \ \ \&\& make clean +endef + +define COPY_UNITD +COPY --from=unit:$(VERSION)-minimal /usr/sbin/unitd* /usr/sbin/ +endef + +define BUILD_MODULE +@@MODULE_PREBUILD@@ \\\n \ +\ \ \ \&\& ./configure $$$$CONFIGURE_ARGS_MODULES --cc-opt="$$$$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \\\n \ +\ \ \ \&\& ./configure @@CONFIGURE@@ \\\n \ +\ \ \ \&\& make -j $$$$NCPU @@INSTALL@@ \\\n \ +\ \ \ \&\& make clean \\\n \ +\ \ \ \&\& ./configure $$$$CONFIGURE_ARGS_MODULES --cc-opt="$$$$CC_OPT" --modulesdir=/usr/lib/unit/modules \\\n \ +\ \ \ \&\& ./configure @@CONFIGURE@@ \\\n \ +\ \ \ \&\& make -j $$$$NCPU @@INSTALL@@ +endef + +$(foreach module, $(MODULES), $(eval BUILD_STEP_$(module) = $(BUILD_MODULE))) +$(foreach module, $(MODULES), $(eval COPY_STEP_$(module) = $(COPY_UNITD))) + default: @echo "valid targets: all build dockerfiles library clean" @@ -104,6 +137,8 @@ Dockerfile.%: ../../version template.Dockerfile @echo "===> Building $@" cat template.Dockerfile | sed \ -e 's,@@VERSION@@,$(VERSION),g' \ + -e 's,@@BUILD_STEP@@,$(BUILD_STEP_$(call modname, $*)),g' \ + -e 's,@@COPY_STEP@@,$(COPY_STEP_$(call modname, $*)),g' \ -e 's,@@PATCHLEVEL@@,$(PATCHLEVEL),g' \ -e 's,@@CONTAINER@@,$(CONTAINER_$*),g' \ -e 's,@@CONFIGURE@@,$(CONFIGURE_$(call modname, $*)),g' \ diff --git a/pkg/docker/template.Dockerfile b/pkg/docker/template.Dockerfile index fe769bb22..b741a5911 100644 --- a/pkg/docker/template.Dockerfile +++ b/pkg/docker/template.Dockerfile @@ -10,6 +10,7 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="@@VERSION@@" +@@COPY_STEP@@ RUN --mount=type=bind,target=/rust,from=rust-build,rw \ set -ex \ && savedAptMark="$(apt-mark showmanual)" \ @@ -44,24 +45,7 @@ RUN --mount=type=bind,target=/rust,from=rust-build,rw \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ - && @@MODULE_PREBUILD@@ \ - && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ - && ./configure @@CONFIGURE@@ \ - && make -j $NCPU @@INSTALL@@ \ - && make clean \ - && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \ - && ./configure @@CONFIGURE@@ \ - && make -j $NCPU @@INSTALL@@ \ + && @@BUILD_STEP@@ \ && cd \ && rm -rf /usr/src/unit \ && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \ From d76306ae0f1c0ab6a82bc4a85e9f0b9e8b6d8e11 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Mon, 30 Dec 2024 23:21:15 +0000 Subject: [PATCH 3/6] Docker: add a dependency on a minimal image to all build targets We need to have this image built to copy the unitd binaries to the modules images. --- pkg/docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 2b01b4658..78aef2936 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -148,7 +148,7 @@ Dockerfile.%: ../../version template.Dockerfile -e 's,@@MODULE@@,$*,g' \ > $@ -build-%: Dockerfile.% +build-%: build-minimal Dockerfile.% docker pull $(CONTAINER_$*) docker build --no-cache -t unit:$(VERSION)-$* -f Dockerfile.$* . touch $@ From b66842b66e36ba8444fb4b26baa6af5b71a7545e Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Mon, 30 Dec 2024 23:18:49 +0000 Subject: [PATCH 4/6] Docker: parametrize Rust container to build with --- pkg/docker/Makefile | 4 ++++ pkg/docker/template.Dockerfile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 78aef2936..0abbc3a25 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -13,6 +13,9 @@ MODULES_SLIM ?= python VARIANT ?= bookworm +VERSION_RUST ?= 1.83.0 +CONTAINER_RUST ?= rust:$(VERSION_RUST)-$(VARIANT) + VERSIONS_minimal ?= CONTAINER_minimal ?= debian:$(VARIANT)-slim CONFIGURE_minimal ?= @@ -141,6 +144,7 @@ Dockerfile.%: ../../version template.Dockerfile -e 's,@@COPY_STEP@@,$(COPY_STEP_$(call modname, $*)),g' \ -e 's,@@PATCHLEVEL@@,$(PATCHLEVEL),g' \ -e 's,@@CONTAINER@@,$(CONTAINER_$*),g' \ + -e 's,@@CONTAINER_RUST@@,$(CONTAINER_RUST),g' \ -e 's,@@CONFIGURE@@,$(CONFIGURE_$(call modname, $*)),g' \ -e 's,@@INSTALL@@,$(INSTALL_$(call modname, $*)),g' \ -e 's,@@RUN@@,$(RUN_$(call modname, $*)),g' \ diff --git a/pkg/docker/template.Dockerfile b/pkg/docker/template.Dockerfile index b741a5911..b3e454050 100644 --- a/pkg/docker/template.Dockerfile +++ b/pkg/docker/template.Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.83.0-bookworm as rust-build +FROM @@CONTAINER_RUST@@ as rust-build FROM @@CONTAINER@@ From b6d5cedee6b38c5706750e3ff3f88ba27fd259c6 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Mon, 30 Dec 2024 16:25:44 -0800 Subject: [PATCH 5/6] Docker: build with plain text output This helps to debug the issues. --- pkg/docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 0abbc3a25..27e3d96ad 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -154,7 +154,7 @@ Dockerfile.%: ../../version template.Dockerfile build-%: build-minimal Dockerfile.% docker pull $(CONTAINER_$*) - docker build --no-cache -t unit:$(VERSION)-$* -f Dockerfile.$* . + docker build --progress=plain --no-cache -t unit:$(VERSION)-$* -f Dockerfile.$* . touch $@ library: From cd6032eda6d6249c13e22cdd7a721b4ec7f1350a Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 31 Dec 2024 00:15:04 +0000 Subject: [PATCH 6/6] Regenerated dockerfiles --- pkg/docker/Dockerfile.go1.22 | 37 ++++++--------------------- pkg/docker/Dockerfile.go1.23 | 37 ++++++--------------------- pkg/docker/Dockerfile.jsc11 | 37 ++++++--------------------- pkg/docker/Dockerfile.minimal | 35 ++++++------------------- pkg/docker/Dockerfile.node20 | 37 ++++++--------------------- pkg/docker/Dockerfile.node22 | 37 ++++++--------------------- pkg/docker/Dockerfile.perl5.38 | 37 ++++++--------------------- pkg/docker/Dockerfile.perl5.40 | 37 ++++++--------------------- pkg/docker/Dockerfile.php8.3 | 37 ++++++--------------------- pkg/docker/Dockerfile.php8.4 | 37 ++++++--------------------- pkg/docker/Dockerfile.python3.12 | 37 ++++++--------------------- pkg/docker/Dockerfile.python3.12-slim | 37 ++++++--------------------- pkg/docker/Dockerfile.python3.13 | 37 ++++++--------------------- pkg/docker/Dockerfile.python3.13-slim | 37 ++++++--------------------- pkg/docker/Dockerfile.ruby3.2 | 37 ++++++--------------------- pkg/docker/Dockerfile.ruby3.3 | 37 ++++++--------------------- pkg/docker/Dockerfile.wasm | 37 ++++++--------------------- pkg/docker/template.Dockerfile | 2 +- 18 files changed, 137 insertions(+), 492 deletions(-) diff --git a/pkg/docker/Dockerfile.go1.22 b/pkg/docker/Dockerfile.go1.22 index 6059fc426..ca511044f 100644 --- a/pkg/docker/Dockerfile.go1.22 +++ b/pkg/docker/Dockerfile.go1.22 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM golang:1.22-bookworm LABEL org.opencontainers.image.title="Unit (go1.22)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure go --go-path=$GOPATH \ diff --git a/pkg/docker/Dockerfile.go1.23 b/pkg/docker/Dockerfile.go1.23 index a1a64602f..cdf7d6979 100644 --- a/pkg/docker/Dockerfile.go1.23 +++ b/pkg/docker/Dockerfile.go1.23 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM golang:1.23-bookworm LABEL org.opencontainers.image.title="Unit (go1.23)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure go --go-path=$GOPATH \ diff --git a/pkg/docker/Dockerfile.jsc11 b/pkg/docker/Dockerfile.jsc11 index f97e0e781..54efdd1cd 100644 --- a/pkg/docker/Dockerfile.jsc11 +++ b/pkg/docker/Dockerfile.jsc11 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM eclipse-temurin:11-jdk-jammy LABEL org.opencontainers.image.title="Unit (jsc11)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure java --jars=/usr/share/unit-jsc-common/ \ diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal index 9bff9d4b2..672b82ecc 100644 --- a/pkg/docker/Dockerfile.minimal +++ b/pkg/docker/Dockerfile.minimal @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM debian:bookworm-slim LABEL org.opencontainers.image.title="Unit (minimal)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ + +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -66,14 +55,6 @@ RUN set -ex \ && make -j $NCPU unitd \ && install -pm755 build/sbin/unitd /usr/sbin/unitd \ && make clean \ - && /bin/true \ - && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ - && ./configure \ - && make -j $NCPU version \ - && make clean \ - && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \ - && ./configure \ - && make -j $NCPU version \ && cd \ && rm -rf /usr/src/unit \ && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \ diff --git a/pkg/docker/Dockerfile.node20 b/pkg/docker/Dockerfile.node20 index 86c3a83b7..bf75eae37 100644 --- a/pkg/docker/Dockerfile.node20 +++ b/pkg/docker/Dockerfile.node20 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM node:20-bookworm LABEL org.opencontainers.image.title="Unit (node20)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && npm -g install node-gyp \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure nodejs --node-gyp=/usr/local/bin/node-gyp \ diff --git a/pkg/docker/Dockerfile.node22 b/pkg/docker/Dockerfile.node22 index 208e59fc7..07986e116 100644 --- a/pkg/docker/Dockerfile.node22 +++ b/pkg/docker/Dockerfile.node22 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM node:22-bookworm LABEL org.opencontainers.image.title="Unit (node22)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && npm -g install node-gyp \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure nodejs --node-gyp=/usr/local/bin/node-gyp \ diff --git a/pkg/docker/Dockerfile.perl5.38 b/pkg/docker/Dockerfile.perl5.38 index d5f340331..64fd51948 100644 --- a/pkg/docker/Dockerfile.perl5.38 +++ b/pkg/docker/Dockerfile.perl5.38 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM perl:5.38-bookworm LABEL org.opencontainers.image.title="Unit (perl5.38)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure perl \ diff --git a/pkg/docker/Dockerfile.perl5.40 b/pkg/docker/Dockerfile.perl5.40 index 6b88a29bb..f6ec76ddb 100644 --- a/pkg/docker/Dockerfile.perl5.40 +++ b/pkg/docker/Dockerfile.perl5.40 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM perl:5.40-bookworm LABEL org.opencontainers.image.title="Unit (perl5.40)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure perl \ diff --git a/pkg/docker/Dockerfile.php8.3 b/pkg/docker/Dockerfile.php8.3 index 3174c02d4..11e7df807 100644 --- a/pkg/docker/Dockerfile.php8.3 +++ b/pkg/docker/Dockerfile.php8.3 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM php:8.3-cli-bookworm LABEL org.opencontainers.image.title="Unit (php8.3)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure php \ diff --git a/pkg/docker/Dockerfile.php8.4 b/pkg/docker/Dockerfile.php8.4 index c6a36da79..ce0ebd177 100644 --- a/pkg/docker/Dockerfile.php8.4 +++ b/pkg/docker/Dockerfile.php8.4 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM php:8.4-cli-bookworm LABEL org.opencontainers.image.title="Unit (php8.4)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure php \ diff --git a/pkg/docker/Dockerfile.python3.12 b/pkg/docker/Dockerfile.python3.12 index 8402dae7f..25c5d7271 100644 --- a/pkg/docker/Dockerfile.python3.12 +++ b/pkg/docker/Dockerfile.python3.12 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM python:3.12-bookworm LABEL org.opencontainers.image.title="Unit (python3.12)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure python --config=/usr/local/bin/python3-config \ diff --git a/pkg/docker/Dockerfile.python3.12-slim b/pkg/docker/Dockerfile.python3.12-slim index f4f957cfb..291eb8b9e 100644 --- a/pkg/docker/Dockerfile.python3.12-slim +++ b/pkg/docker/Dockerfile.python3.12-slim @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM python:3.12-slim-bookworm LABEL org.opencontainers.image.title="Unit (python3.12-slim)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure python --config=/usr/local/bin/python3-config \ diff --git a/pkg/docker/Dockerfile.python3.13 b/pkg/docker/Dockerfile.python3.13 index dd6a91d43..7ffa93638 100644 --- a/pkg/docker/Dockerfile.python3.13 +++ b/pkg/docker/Dockerfile.python3.13 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM python:3.13-bookworm LABEL org.opencontainers.image.title="Unit (python3.13)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure python --config=/usr/local/bin/python3-config \ diff --git a/pkg/docker/Dockerfile.python3.13-slim b/pkg/docker/Dockerfile.python3.13-slim index 6ca776163..ccc49688f 100644 --- a/pkg/docker/Dockerfile.python3.13-slim +++ b/pkg/docker/Dockerfile.python3.13-slim @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM python:3.13-slim-bookworm LABEL org.opencontainers.image.title="Unit (python3.13-slim)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure python --config=/usr/local/bin/python3-config \ diff --git a/pkg/docker/Dockerfile.ruby3.2 b/pkg/docker/Dockerfile.ruby3.2 index 93302277c..581c3e9e6 100644 --- a/pkg/docker/Dockerfile.ruby3.2 +++ b/pkg/docker/Dockerfile.ruby3.2 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM ruby:3.2-bookworm LABEL org.opencontainers.image.title="Unit (ruby3.2)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure ruby \ diff --git a/pkg/docker/Dockerfile.ruby3.3 b/pkg/docker/Dockerfile.ruby3.3 index 45fdc963c..710ccf192 100644 --- a/pkg/docker/Dockerfile.ruby3.3 +++ b/pkg/docker/Dockerfile.ruby3.3 @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM ruby:3.3-bookworm LABEL org.opencontainers.image.title="Unit (ruby3.3)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && /bin/true \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure ruby \ diff --git a/pkg/docker/Dockerfile.wasm b/pkg/docker/Dockerfile.wasm index cb6c51a95..a2407241e 100644 --- a/pkg/docker/Dockerfile.wasm +++ b/pkg/docker/Dockerfile.wasm @@ -1,3 +1,5 @@ +FROM rust:1.83.0-bookworm AS rust-build + FROM debian:bookworm-slim LABEL org.opencontainers.image.title="Unit (wasm)" @@ -8,30 +10,17 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " LABEL org.opencontainers.image.version="1.34.0" -RUN set -ex \ +COPY --from=unit:1.34.0-minimal /usr/sbin/unitd* /usr/sbin/ +RUN --mount=type=bind,target=/rust,from=rust-build,rw \ + set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config libclang-dev cmake \ - && export RUST_VERSION=1.83.0 \ - && export RUSTUP_HOME=/usr/src/unit/rustup \ - && export CARGO_HOME=/usr/src/unit/cargo \ - && export PATH=/usr/src/unit/cargo/bin:$PATH \ + && export RUSTUP_HOME=/rust/usr/local/rustup \ + && export CARGO_HOME=/rust/usr/local/cargo \ + && export PATH=/rust/usr/local/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 \ @@ -56,16 +45,6 @@ RUN set -ex \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ --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 \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \ - && make clean \ - && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \ - && make -j $NCPU unitd \ - && install -pm755 build/sbin/unitd /usr/sbin/unitd \ - && make clean \ && make -C pkg/contrib .wasmtime \ && 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 \ diff --git a/pkg/docker/template.Dockerfile b/pkg/docker/template.Dockerfile index b3e454050..0870598dc 100644 --- a/pkg/docker/template.Dockerfile +++ b/pkg/docker/template.Dockerfile @@ -1,4 +1,4 @@ -FROM @@CONTAINER_RUST@@ as rust-build +FROM @@CONTAINER_RUST@@ AS rust-build FROM @@CONTAINER@@