Skip to content

Commit

Permalink
Docker: Mount rust from image at build time instead of downloading it
Browse files Browse the repository at this point in the history
This ensures that rust is not left behind in the image
  • Loading branch information
LaurentGoderre committed Dec 20, 2024
1 parent 706b994 commit 1d29840
Show file tree
Hide file tree
Showing 18 changed files with 144 additions and 360 deletions.
28 changes: 8 additions & 20 deletions pkg/docker/Dockerfile.go1.22
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM rust:1.83.0-bookworm AS rust

FROM golang:1.22-bookworm

LABEL org.opencontainers.image.title="Unit (go1.22)"
Expand All @@ -8,30 +10,16 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.version="1.34.0"

RUN set -ex \
RUN --mount=type=bind,target=/rust,from=rust,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 \
&& 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 \
&& export RUSTUP_HOME=/rust/usr/src/unit/rustup \
&& export CARGO_HOME=/rust/usr/src/unit/cargo \
&& export PATH=/rust/usr/local/cargo/bin/:$PATH \
&& rustup default stable \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
Expand Down
28 changes: 8 additions & 20 deletions pkg/docker/Dockerfile.go1.23
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM rust:1.83.0-bookworm AS rust

FROM golang:1.23-bookworm

LABEL org.opencontainers.image.title="Unit (go1.23)"
Expand All @@ -8,30 +10,16 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.version="1.34.0"

RUN set -ex \
RUN --mount=type=bind,target=/rust,from=rust,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 \
&& 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 \
&& export RUSTUP_HOME=/rust/usr/src/unit/rustup \
&& export CARGO_HOME=/rust/usr/src/unit/cargo \
&& export PATH=/rust/usr/local/cargo/bin/:$PATH \
&& rustup default stable \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
Expand Down
28 changes: 8 additions & 20 deletions pkg/docker/Dockerfile.jsc11
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM rust:1.83.0-bookworm AS rust

FROM eclipse-temurin:11-jdk-jammy

LABEL org.opencontainers.image.title="Unit (jsc11)"
Expand All @@ -8,30 +10,16 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.version="1.34.0"

RUN set -ex \
RUN --mount=type=bind,target=/rust,from=rust,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 \
&& 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 \
&& export RUSTUP_HOME=/rust/usr/src/unit/rustup \
&& export CARGO_HOME=/rust/usr/src/unit/cargo \
&& export PATH=/rust/usr/local/cargo/bin/:$PATH \
&& rustup default stable \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
Expand Down
28 changes: 8 additions & 20 deletions pkg/docker/Dockerfile.minimal
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM rust:1.83.0-bookworm AS rust

FROM debian:bookworm-slim

LABEL org.opencontainers.image.title="Unit (minimal)"
Expand All @@ -8,30 +10,16 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.version="1.34.0"

RUN set -ex \
RUN --mount=type=bind,target=/rust,from=rust,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 \
&& 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 \
&& export RUSTUP_HOME=/rust/usr/src/unit/rustup \
&& export CARGO_HOME=/rust/usr/src/unit/cargo \
&& export PATH=/rust/usr/local/cargo/bin/:$PATH \
&& rustup default stable \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
Expand Down
28 changes: 8 additions & 20 deletions pkg/docker/Dockerfile.node20
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM rust:1.83.0-bookworm AS rust

FROM node:20-bookworm

LABEL org.opencontainers.image.title="Unit (node20)"
Expand All @@ -8,30 +10,16 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.version="1.34.0"

RUN set -ex \
RUN --mount=type=bind,target=/rust,from=rust,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 \
&& 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 \
&& export RUSTUP_HOME=/rust/usr/src/unit/rustup \
&& export CARGO_HOME=/rust/usr/src/unit/cargo \
&& export PATH=/rust/usr/local/cargo/bin/:$PATH \
&& rustup default stable \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
Expand Down
28 changes: 8 additions & 20 deletions pkg/docker/Dockerfile.node22
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM rust:1.83.0-bookworm AS rust

FROM node:22-bookworm

LABEL org.opencontainers.image.title="Unit (node22)"
Expand All @@ -8,30 +10,16 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.version="1.34.0"

RUN set -ex \
RUN --mount=type=bind,target=/rust,from=rust,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 \
&& 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 \
&& export RUSTUP_HOME=/rust/usr/src/unit/rustup \
&& export CARGO_HOME=/rust/usr/src/unit/cargo \
&& export PATH=/rust/usr/local/cargo/bin/:$PATH \
&& rustup default stable \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
Expand Down
28 changes: 8 additions & 20 deletions pkg/docker/Dockerfile.perl5.38
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM rust:1.83.0-bookworm AS rust

FROM perl:5.38-bookworm

LABEL org.opencontainers.image.title="Unit (perl5.38)"
Expand All @@ -8,30 +10,16 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.version="1.34.0"

RUN set -ex \
RUN --mount=type=bind,target=/rust,from=rust,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 \
&& 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 \
&& export RUSTUP_HOME=/rust/usr/src/unit/rustup \
&& export CARGO_HOME=/rust/usr/src/unit/cargo \
&& export PATH=/rust/usr/local/cargo/bin/:$PATH \
&& rustup default stable \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
Expand Down
28 changes: 8 additions & 20 deletions pkg/docker/Dockerfile.perl5.40
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM rust:1.83.0-bookworm AS rust

FROM perl:5.40-bookworm

LABEL org.opencontainers.image.title="Unit (perl5.40)"
Expand All @@ -8,30 +10,16 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.version="1.34.0"

RUN set -ex \
RUN --mount=type=bind,target=/rust,from=rust,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 \
&& 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 \
&& export RUSTUP_HOME=/rust/usr/src/unit/rustup \
&& export CARGO_HOME=/rust/usr/src/unit/cargo \
&& export PATH=/rust/usr/local/cargo/bin/:$PATH \
&& rustup default stable \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
Expand Down
28 changes: 8 additions & 20 deletions pkg/docker/Dockerfile.php8.3
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM rust:1.83.0-bookworm AS rust

FROM php:8.3-cli-bookworm

LABEL org.opencontainers.image.title="Unit (php8.3)"
Expand All @@ -8,30 +10,16 @@ LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installatio
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
LABEL org.opencontainers.image.version="1.34.0"

RUN set -ex \
RUN --mount=type=bind,target=/rust,from=rust,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 \
&& 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 \
&& export RUSTUP_HOME=/rust/usr/src/unit/rustup \
&& export CARGO_HOME=/rust/usr/src/unit/cargo \
&& export PATH=/rust/usr/local/cargo/bin/:$PATH \
&& rustup default stable \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
Expand Down
Loading

0 comments on commit 1d29840

Please sign in to comment.