Fixed dockerfiles
All checks were successful
Build Docker Image / Build ARM64 (3.10) (push) Successful in 4m35s
Build Docker Image / Build ARM64 (3.11) (push) Successful in 4m8s
Build Docker Image / Build ARM64 (3.12) (push) Successful in 4m9s
Build Docker Image / Build ARM64 (3.13) (push) Successful in 4m8s
Build Docker Image / Build ARM64 (3.14) (push) Successful in 4m32s
Build Docker Image / Build AMD64 (3.10) (push) Successful in 50m34s
Build Docker Image / Build AMD64 (3.11) (push) Successful in 46m52s
Build Docker Image / Build AMD64 (3.12) (push) Successful in 46m41s
Build Docker Image / Build AMD64 (3.13) (push) Successful in 47m14s
Build Docker Image / Build AMD64 (3.14) (push) Successful in 46m51s
Build Docker Image / Create Multi-arch Manifest (3.10) (push) Successful in 10s
Build Docker Image / Create Multi-arch Manifest (3.11) (push) Successful in 10s
Build Docker Image / Create Multi-arch Manifest (3.12) (push) Successful in 10s
Build Docker Image / Create Multi-arch Manifest (3.13) (push) Successful in 10s
Build Docker Image / Create Multi-arch Manifest (3.14) (push) Successful in 10s

This commit is contained in:
2025-10-10 12:24:35 +03:00
parent 3691e860c5
commit fab11ef95d
5 changed files with 36 additions and 21 deletions

View File

@@ -1,6 +1,6 @@
FROM python:3.10-slim FROM python:3.10-slim
LABEL org.opencontainers.image.title="Unit (python3.10-slim)" LABEL org.opencontainers.image.title="Unit (python3.13-slim)"
LABEL org.opencontainers.image.description="Official build of Unit for Docker." LABEL org.opencontainers.image.description="Official build of Unit for Docker."
LABEL org.opencontainers.image.url="https://unit.nginx.org" LABEL org.opencontainers.image.url="https://unit.nginx.org"
LABEL org.opencontainers.image.source="https://github.com/nginx/unit" LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
@@ -12,8 +12,8 @@ RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \ && savedAptMark="$(apt-mark showmanual)" \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \ && 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 \ ca-certificates git build-essential libssl-dev libpcre2-dev zlib1g-dev libzstd-dev libbrotli-dev curl pkg-config pkgconf libclang-dev cmake \
&& export RUST_VERSION=1.83.0 \ && export RUST_VERSION=1.89.0 \
&& export RUSTUP_HOME=/usr/src/unit/rustup \ && export RUSTUP_HOME=/usr/src/unit/rustup \
&& export CARGO_HOME=/usr/src/unit/cargo \ && export CARGO_HOME=/usr/src/unit/cargo \
&& export PATH=/usr/src/unit/cargo/bin:$PATH \ && export PATH=/usr/src/unit/cargo/bin:$PATH \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \ && mkdir -p /usr/src/unit \
&& cd /usr/src/unit \ && cd /usr/src/unit \
&& git clone --depth 1 -b 1.35.0-1 https://github.com/nginx/unit \ && git clone --depth 1 -b 1.35.0 https://github.com/nginx/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \ && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -55,7 +55,10 @@ RUN set -ex \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \ --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
--njs \ --njs \
--otel" \ --otel \
--zlib \
--zstd \
--brotli" \
&& make -j $NCPU -C pkg/contrib .njs \ && make -j $NCPU -C pkg/contrib .njs \
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \ && 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 \ && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \

View File

@@ -12,8 +12,8 @@ RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \ && savedAptMark="$(apt-mark showmanual)" \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \ && 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 \ ca-certificates git build-essential libssl-dev libpcre2-dev zlib1g-dev libzstd-dev libbrotli-dev curl pkg-config pkgconf libclang-dev cmake \
&& export RUST_VERSION=1.83.0 \ && export RUST_VERSION=1.89.0 \
&& export RUSTUP_HOME=/usr/src/unit/rustup \ && export RUSTUP_HOME=/usr/src/unit/rustup \
&& export CARGO_HOME=/usr/src/unit/cargo \ && export CARGO_HOME=/usr/src/unit/cargo \
&& export PATH=/usr/src/unit/cargo/bin:$PATH \ && export PATH=/usr/src/unit/cargo/bin:$PATH \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \ && mkdir -p /usr/src/unit \
&& cd /usr/src/unit \ && cd /usr/src/unit \
&& git clone --depth 1 -b 1.35.0-1 https://github.com/nginx/unit \ && git clone --depth 1 -b 1.35.0 https://github.com/nginx/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \ && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -55,7 +55,10 @@ RUN set -ex \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \ --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
--njs \ --njs \
--otel" \ --otel \
--zlib \
--zstd \
--brotli" \
&& make -j $NCPU -C pkg/contrib .njs \ && make -j $NCPU -C pkg/contrib .njs \
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \ && 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 \ && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \

View File

@@ -12,8 +12,8 @@ RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \ && savedAptMark="$(apt-mark showmanual)" \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \ && 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 \ ca-certificates git build-essential libssl-dev libpcre2-dev zlib1g-dev libzstd-dev libbrotli-dev curl pkg-config pkgconf libclang-dev cmake \
&& export RUST_VERSION=1.83.0 \ && export RUST_VERSION=1.89.0 \
&& export RUSTUP_HOME=/usr/src/unit/rustup \ && export RUSTUP_HOME=/usr/src/unit/rustup \
&& export CARGO_HOME=/usr/src/unit/cargo \ && export CARGO_HOME=/usr/src/unit/cargo \
&& export PATH=/usr/src/unit/cargo/bin:$PATH \ && export PATH=/usr/src/unit/cargo/bin:$PATH \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \ && mkdir -p /usr/src/unit \
&& cd /usr/src/unit \ && cd /usr/src/unit \
&& git clone --depth 1 -b 1.35.0-1 https://github.com/nginx/unit \ && git clone --depth 1 -b 1.35.0 https://github.com/nginx/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \ && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -55,7 +55,10 @@ RUN set -ex \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \ --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
--njs \ --njs \
--otel" \ --otel \
--zlib \
--zstd \
--brotli" \
&& make -j $NCPU -C pkg/contrib .njs \ && make -j $NCPU -C pkg/contrib .njs \
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \ && 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 \ && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \

View File

@@ -12,8 +12,8 @@ RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \ && savedAptMark="$(apt-mark showmanual)" \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \ && 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 \ ca-certificates git build-essential libssl-dev libpcre2-dev zlib1g-dev libzstd-dev libbrotli-dev curl pkg-config pkgconf libclang-dev cmake \
&& export RUST_VERSION=1.83.0 \ && export RUST_VERSION=1.89.0 \
&& export RUSTUP_HOME=/usr/src/unit/rustup \ && export RUSTUP_HOME=/usr/src/unit/rustup \
&& export CARGO_HOME=/usr/src/unit/cargo \ && export CARGO_HOME=/usr/src/unit/cargo \
&& export PATH=/usr/src/unit/cargo/bin:$PATH \ && export PATH=/usr/src/unit/cargo/bin:$PATH \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \ && mkdir -p /usr/src/unit \
&& cd /usr/src/unit \ && cd /usr/src/unit \
&& git clone --depth 1 -b 1.35.0-1 https://github.com/nginx/unit \ && git clone --depth 1 -b 1.35.0 https://github.com/nginx/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \ && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -55,7 +55,10 @@ RUN set -ex \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \ --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
--njs \ --njs \
--otel" \ --otel \
--zlib \
--zstd \
--brotli" \
&& make -j $NCPU -C pkg/contrib .njs \ && make -j $NCPU -C pkg/contrib .njs \
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \ && 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 \ && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \

View File

@@ -12,8 +12,8 @@ RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \ && savedAptMark="$(apt-mark showmanual)" \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \ && 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 \ ca-certificates git build-essential libssl-dev libpcre2-dev zlib1g-dev libzstd-dev libbrotli-dev curl pkg-config pkgconf libclang-dev cmake \
&& export RUST_VERSION=1.83.0 \ && export RUST_VERSION=1.89.0 \
&& export RUSTUP_HOME=/usr/src/unit/rustup \ && export RUSTUP_HOME=/usr/src/unit/rustup \
&& export CARGO_HOME=/usr/src/unit/cargo \ && export CARGO_HOME=/usr/src/unit/cargo \
&& export PATH=/usr/src/unit/cargo/bin:$PATH \ && export PATH=/usr/src/unit/cargo/bin:$PATH \
@@ -35,7 +35,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \ && mkdir -p /usr/src/unit \
&& cd /usr/src/unit \ && cd /usr/src/unit \
&& git clone --depth 1 -b 1.35.0-1 https://github.com/nginx/unit \ && git clone --depth 1 -b 1.35.0 https://github.com/nginx/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \ && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -55,7 +55,10 @@ RUN set -ex \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \ --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \ && CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
--njs \ --njs \
--otel" \ --otel \
--zlib \
--zstd \
--brotli" \
&& make -j $NCPU -C pkg/contrib .njs \ && make -j $NCPU -C pkg/contrib .njs \
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \ && 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 \ && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \