technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Regenerated Dockerfiles.

Browse Source
This commit is contained in:
Konstantin Pavlov
2023-08-22 14:55:10 -07:00
parent 45bfba04bc
commit 31ce5001a0
12 changed files with 453 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/docker/Dockerfile.go1.20
View File

@@ -1,6 +1,6 @@
FROM golang:1.20-bullseye FROM golang:1.20-bullseye
LABEL org.opencontainers.image.title="Unit" LABEL org.opencontainers.image.title="Unit (go1.20)"
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"
@@ -13,6 +13,8 @@ RUN set -ex \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& 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 \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \ && hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
@@ -22,7 +24,9 @@ RUN set -ex \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \ && CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \ --statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \ --control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tmpdir=/var/tmp \ --tmpdir=/var/tmp \
--user=unit \ --user=unit \
@@ -41,6 +45,7 @@ RUN set -ex \
&& make -j $NCPU unitd \ && make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \ && install -pm755 build/sbin/unitd /usr/sbin/unitd \
&& make clean \ && make clean \
&& /bin/true \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& ./configure go --go-path=$GOPATH \ && ./configure go --go-path=$GOPATH \
&& make -j $NCPU go-install-src libunit-install \ && make -j $NCPU go-install-src libunit-install \
@@ -49,7 +54,7 @@ RUN set -ex \
&& ./configure go --go-path=$GOPATH \ && ./configure go --go-path=$GOPATH \
&& make -j $NCPU go-install-src libunit-install \ && make -j $NCPU go-install-src libunit-install \
&& cd \ && cd \
&& rm -rf unit \ && rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \ && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \ ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \ done \
@@ -57,7 +62,7 @@ RUN set -ex \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& /bin/true \ && /bin/true \
&& mkdir -p /var/lib/unit/ \ && mkdir -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \ && groupadd --gid 999 unit \
&& useradd \ && useradd \
--uid 999 \ --uid 999 \
@@ -69,7 +74,7 @@ RUN set -ex \
unit \ unit \
&& apt-get update \ && apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \ && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stdout /var/log/unit.log

89
pkg/docker/Dockerfile.go1.21 Normal file
View File

@@ -0,0 +1,89 @@
FROM golang:1.21-bullseye
LABEL org.opencontainers.image.title="Unit (go1.21)"
LABEL org.opencontainers.image.description="Official build of Unit for Docker."
LABEL org.opencontainers.image.url="https://unit.nginx.org"
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <docker-maint@nginx.com>"
LABEL org.opencontainers.image.version="1.30.0"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \
--tmpdir=/var/tmp \
--user=unit \
--group=unit \
--openssl \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
--njs" \
&& 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 \
&& make -j $NCPU go-install-src libunit-install \
&& make clean \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
&& ./configure go --go-path=$GOPATH \
&& make -j $NCPU go-install-src libunit-install \
&& cd \
&& rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& /bin/true \
&& mkdir -p /var/lib/unit/ \
&& mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \
&& useradd \
--uid 999 \
--gid unit \
--no-create-home \
--home /nonexistent \
--comment "unit user" \
--shell /bin/false \
unit \
&& apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/
STOPSIGNAL SIGTERM
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
EXPOSE 80
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]

15
pkg/docker/Dockerfile.jsc11
View File

@@ -1,6 +1,6 @@
FROM eclipse-temurin:11-jdk-jammy FROM eclipse-temurin:11-jdk-jammy
LABEL org.opencontainers.image.title="Unit" LABEL org.opencontainers.image.title="Unit (jsc11)"
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"
@@ -13,6 +13,8 @@ RUN set -ex \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& 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 \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \ && hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
@@ -22,7 +24,9 @@ RUN set -ex \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \ && CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \ --statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \ --control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tmpdir=/var/tmp \ --tmpdir=/var/tmp \
--user=unit \ --user=unit \
@@ -41,6 +45,7 @@ RUN set -ex \
&& make -j $NCPU unitd \ && make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \ && install -pm755 build/sbin/unitd /usr/sbin/unitd \
&& make clean \ && make clean \
&& /bin/true \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& ./configure java --jars=/usr/share/unit-jsc-common/ \ && ./configure java --jars=/usr/share/unit-jsc-common/ \
&& make -j $NCPU java-shared-install java-install \ && make -j $NCPU java-shared-install java-install \
@@ -49,15 +54,15 @@ RUN set -ex \
&& ./configure java --jars=/usr/share/unit-jsc-common/ \ && ./configure java --jars=/usr/share/unit-jsc-common/ \
&& make -j $NCPU java-shared-install java-install \ && make -j $NCPU java-shared-install java-install \
&& cd \ && cd \
&& rm -rf unit \ && rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \ && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \ ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \ done \
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \ && apt-mark showmanual | xargs apt-mark auto > /dev/null \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& /bin/true \ && rm -rf /root/.m2 \
&& mkdir -p /var/lib/unit/ \ && mkdir -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \ && groupadd --gid 999 unit \
&& useradd \ && useradd \
--uid 999 \ --uid 999 \
@@ -69,7 +74,7 @@ RUN set -ex \
unit \ unit \
&& apt-get update \ && apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \ && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stdout /var/log/unit.log

13
pkg/docker/Dockerfile.minimal
View File

@@ -1,6 +1,6 @@
FROM debian:bullseye-slim FROM debian:bullseye-slim
LABEL org.opencontainers.image.title="Unit" LABEL org.opencontainers.image.title="Unit (minimal)"
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"
@@ -13,6 +13,8 @@ RUN set -ex \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& 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 \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \ && hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
@@ -22,7 +24,9 @@ RUN set -ex \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \ && CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \ --statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \ --control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tmpdir=/var/tmp \ --tmpdir=/var/tmp \
--user=unit \ --user=unit \
@@ -41,6 +45,7 @@ RUN set -ex \
&& make -j $NCPU unitd \ && make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \ && install -pm755 build/sbin/unitd /usr/sbin/unitd \
&& make clean \ && make clean \
&& /bin/true \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& ./configure \ && ./configure \
&& make -j $NCPU version \ && make -j $NCPU version \
@@ -49,7 +54,7 @@ RUN set -ex \
&& ./configure \ && ./configure \
&& make -j $NCPU version \ && make -j $NCPU version \
&& cd \ && cd \
&& rm -rf unit \ && rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \ && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \ ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \ done \
@@ -57,7 +62,7 @@ RUN set -ex \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& /bin/true \ && /bin/true \
&& mkdir -p /var/lib/unit/ \ && mkdir -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \ && groupadd --gid 999 unit \
&& useradd \ && useradd \
--uid 999 \ --uid 999 \
@@ -69,7 +74,7 @@ RUN set -ex \
unit \ unit \
&& apt-get update \ && apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \ && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stdout /var/log/unit.log

19
pkg/docker/Dockerfile.node18
View File

@@ -1,6 +1,6 @@
FROM node:18-bullseye FROM node:18-bullseye
LABEL org.opencontainers.image.title="Unit" LABEL org.opencontainers.image.title="Unit (node18)"
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"
@@ -13,6 +13,8 @@ RUN set -ex \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& 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 \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \ && hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
@@ -22,7 +24,9 @@ RUN set -ex \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \ && CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \ --statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \ --control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tmpdir=/var/tmp \ --tmpdir=/var/tmp \
--user=unit \ --user=unit \
@@ -41,23 +45,24 @@ RUN set -ex \
&& make -j $NCPU unitd \ && make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \ && install -pm755 build/sbin/unitd /usr/sbin/unitd \
&& make clean \ && make clean \
&& npm -g install node-gyp \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& ./configure nodejs --node-gyp=/usr/local/lib/node_modules/npm/bin/node-gyp-bin/node-gyp \ && ./configure nodejs --node-gyp=/usr/local/bin/node-gyp \
&& make -j $NCPU node node-install libunit-install \ && make -j $NCPU node node-install libunit-install \
&& make clean \ && make clean \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
&& ./configure nodejs --node-gyp=/usr/local/lib/node_modules/npm/bin/node-gyp-bin/node-gyp \ && ./configure nodejs --node-gyp=/usr/local/bin/node-gyp \
&& make -j $NCPU node node-install libunit-install \ && make -j $NCPU node node-install libunit-install \
&& cd \ && cd \
&& rm -rf unit \ && rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \ && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \ ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \ done \
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \ && apt-mark showmanual | xargs apt-mark auto > /dev/null \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& /bin/true \ && rm -rf /root/.cache/ && rm -rf /root/.npm \
&& mkdir -p /var/lib/unit/ \ && mkdir -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \ && groupadd --gid 999 unit \
&& useradd \ && useradd \
--uid 999 \ --uid 999 \
@@ -69,7 +74,7 @@ RUN set -ex \
unit \ unit \
&& apt-get update \ && apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \ && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stdout /var/log/unit.log

89
pkg/docker/Dockerfile.node20 Normal file
View File

@@ -0,0 +1,89 @@
FROM node:20-bullseye
LABEL org.opencontainers.image.title="Unit (node20)"
LABEL org.opencontainers.image.description="Official build of Unit for Docker."
LABEL org.opencontainers.image.url="https://unit.nginx.org"
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <docker-maint@nginx.com>"
LABEL org.opencontainers.image.version="1.30.0"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \
--tmpdir=/var/tmp \
--user=unit \
--group=unit \
--openssl \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
--njs" \
&& 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 \
&& make -j $NCPU node node-install libunit-install \
&& make clean \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
&& ./configure nodejs --node-gyp=/usr/local/bin/node-gyp \
&& make -j $NCPU node node-install libunit-install \
&& cd \
&& rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& rm -rf /root/.cache/ && rm -rf /root/.npm \
&& mkdir -p /var/lib/unit/ \
&& mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \
&& useradd \
--uid 999 \
--gid unit \
--no-create-home \
--home /nonexistent \
--comment "unit user" \
--shell /bin/false \
unit \
&& apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/
STOPSIGNAL SIGTERM
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
EXPOSE 80
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]

13
pkg/docker/Dockerfile.perl5.36
View File

@@ -1,6 +1,6 @@
FROM perl:5.36-bullseye FROM perl:5.36-bullseye
LABEL org.opencontainers.image.title="Unit" LABEL org.opencontainers.image.title="Unit (perl5.36)"
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"
@@ -13,6 +13,8 @@ RUN set -ex \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& 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 \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \ && hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
@@ -22,7 +24,9 @@ RUN set -ex \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \ && CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \ --statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \ --control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tmpdir=/var/tmp \ --tmpdir=/var/tmp \
--user=unit \ --user=unit \
@@ -41,6 +45,7 @@ RUN set -ex \
&& make -j $NCPU unitd \ && make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \ && install -pm755 build/sbin/unitd /usr/sbin/unitd \
&& make clean \ && make clean \
&& /bin/true \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& ./configure perl \ && ./configure perl \
&& make -j $NCPU perl-install \ && make -j $NCPU perl-install \
@@ -49,7 +54,7 @@ RUN set -ex \
&& ./configure perl \ && ./configure perl \
&& make -j $NCPU perl-install \ && make -j $NCPU perl-install \
&& cd \ && cd \
&& rm -rf unit \ && rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \ && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \ ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \ done \
@@ -57,7 +62,7 @@ RUN set -ex \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& /bin/true \ && /bin/true \
&& mkdir -p /var/lib/unit/ \ && mkdir -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \ && groupadd --gid 999 unit \
&& useradd \ && useradd \
--uid 999 \ --uid 999 \
@@ -69,7 +74,7 @@ RUN set -ex \
unit \ unit \
&& apt-get update \ && apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \ && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stdout /var/log/unit.log

89
pkg/docker/Dockerfile.perl5.38 Normal file
View File

@@ -0,0 +1,89 @@
FROM perl:5.38-bullseye
LABEL org.opencontainers.image.title="Unit (perl5.38)"
LABEL org.opencontainers.image.description="Official build of Unit for Docker."
LABEL org.opencontainers.image.url="https://unit.nginx.org"
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <docker-maint@nginx.com>"
LABEL org.opencontainers.image.version="1.30.0"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \
--tmpdir=/var/tmp \
--user=unit \
--group=unit \
--openssl \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
--njs" \
&& 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 \
&& make -j $NCPU perl-install \
&& make clean \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
&& ./configure perl \
&& make -j $NCPU perl-install \
&& cd \
&& rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& /bin/true \
&& mkdir -p /var/lib/unit/ \
&& mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \
&& useradd \
--uid 999 \
--gid unit \
--no-create-home \
--home /nonexistent \
--comment "unit user" \
--shell /bin/false \
unit \
&& apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/
STOPSIGNAL SIGTERM
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
EXPOSE 80
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]

13
pkg/docker/Dockerfile.php8.2
View File

@@ -1,6 +1,6 @@
FROM php:8.2-cli-bullseye FROM php:8.2-cli-bullseye
LABEL org.opencontainers.image.title="Unit" LABEL org.opencontainers.image.title="Unit (php8.2)"
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"
@@ -13,6 +13,8 @@ RUN set -ex \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& 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 \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \ && hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
@@ -22,7 +24,9 @@ RUN set -ex \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \ && CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \ --statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \ --control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tmpdir=/var/tmp \ --tmpdir=/var/tmp \
--user=unit \ --user=unit \
@@ -41,6 +45,7 @@ RUN set -ex \
&& make -j $NCPU unitd \ && make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \ && install -pm755 build/sbin/unitd /usr/sbin/unitd \
&& make clean \ && make clean \
&& /bin/true \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& ./configure php \ && ./configure php \
&& make -j $NCPU php-install \ && make -j $NCPU php-install \
@@ -49,7 +54,7 @@ RUN set -ex \
&& ./configure php \ && ./configure php \
&& make -j $NCPU php-install \ && make -j $NCPU php-install \
&& cd \ && cd \
&& rm -rf unit \ && rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \ && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \ ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \ done \
@@ -57,7 +62,7 @@ RUN set -ex \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& ldconfig \ && ldconfig \
&& mkdir -p /var/lib/unit/ \ && mkdir -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \ && groupadd --gid 999 unit \
&& useradd \ && useradd \
--uid 999 \ --uid 999 \
@@ -69,7 +74,7 @@ RUN set -ex \
unit \ unit \
&& apt-get update \ && apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \ && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stdout /var/log/unit.log

13
pkg/docker/Dockerfile.python3.11
View File

@@ -1,6 +1,6 @@
FROM python:3.11-bullseye FROM python:3.11-bullseye
LABEL org.opencontainers.image.title="Unit" LABEL org.opencontainers.image.title="Unit (python3.11)"
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"
@@ -13,6 +13,8 @@ RUN set -ex \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& 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 \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \ && hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
@@ -22,7 +24,9 @@ RUN set -ex \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \ && CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \ --statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \ --control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tmpdir=/var/tmp \ --tmpdir=/var/tmp \
--user=unit \ --user=unit \
@@ -41,6 +45,7 @@ RUN set -ex \
&& make -j $NCPU unitd \ && make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \ && install -pm755 build/sbin/unitd /usr/sbin/unitd \
&& make clean \ && make clean \
&& /bin/true \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& ./configure python --config=/usr/local/bin/python3-config \ && ./configure python --config=/usr/local/bin/python3-config \
&& make -j $NCPU python3-install \ && make -j $NCPU python3-install \
@@ -49,7 +54,7 @@ RUN set -ex \
&& ./configure python --config=/usr/local/bin/python3-config \ && ./configure python --config=/usr/local/bin/python3-config \
&& make -j $NCPU python3-install \ && make -j $NCPU python3-install \
&& cd \ && cd \
&& rm -rf unit \ && rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \ && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \ ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \ done \
@@ -57,7 +62,7 @@ RUN set -ex \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& /bin/true \ && /bin/true \
&& mkdir -p /var/lib/unit/ \ && mkdir -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \ && groupadd --gid 999 unit \
&& useradd \ && useradd \
--uid 999 \ --uid 999 \
@@ -69,7 +74,7 @@ RUN set -ex \
unit \ unit \
&& apt-get update \ && apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \ && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stdout /var/log/unit.log

15
pkg/docker/Dockerfile.ruby3.2
View File

@@ -1,6 +1,6 @@
FROM ruby:3.2-bullseye FROM ruby:3.2-bullseye
LABEL org.opencontainers.image.title="Unit" LABEL org.opencontainers.image.title="Unit (ruby3.2)"
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"
@@ -13,6 +13,8 @@ RUN set -ex \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& 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 \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \ && hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \ && cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \
@@ -22,7 +24,9 @@ RUN set -ex \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \ && CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \ --statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \ --control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tmpdir=/var/tmp \ --tmpdir=/var/tmp \
--user=unit \ --user=unit \
@@ -41,6 +45,7 @@ RUN set -ex \
&& make -j $NCPU unitd \ && make -j $NCPU unitd \
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \ && install -pm755 build/sbin/unitd /usr/sbin/unitd \
&& make clean \ && make clean \
&& /bin/true \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \ && ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& ./configure ruby \ && ./configure ruby \
&& make -j $NCPU ruby-install \ && make -j $NCPU ruby-install \
@@ -49,15 +54,15 @@ RUN set -ex \
&& ./configure ruby \ && ./configure ruby \
&& make -j $NCPU ruby-install \ && make -j $NCPU ruby-install \
&& cd \ && cd \
&& rm -rf unit \ && rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \ && for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \ ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \ done \
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \ && apt-mark showmanual | xargs apt-mark auto > /dev/null \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& gem install rack \ && gem install rack && rm -rf /root/.local \
&& mkdir -p /var/lib/unit/ \ && mkdir -p /var/lib/unit/ \
&& mkdir /docker-entrypoint.d/ \ && mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \ && groupadd --gid 999 unit \
&& useradd \ && useradd \
--uid 999 \ --uid 999 \
@@ -69,7 +74,7 @@ RUN set -ex \
unit \ unit \
&& apt-get update \ && apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \ && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove \ && apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \ && rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log && ln -sf /dev/stdout /var/log/unit.log

109
pkg/docker/Dockerfile.wasm Normal file
View File

@@ -0,0 +1,109 @@
FROM debian:bullseye-slim
LABEL org.opencontainers.image.title="Unit (wasm)"
LABEL org.opencontainers.image.description="Official build of Unit for Docker."
LABEL org.opencontainers.image.url="https://unit.nginx.org"
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <docker-maint@nginx.com>"
LABEL org.opencontainers.image.version="1.30.0"
RUN set -ex \
&& savedAptMark="$(apt-mark showmanual)" \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
--statedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \
--runstatedir=/var/run \
--pid=/var/run/unit.pid \
--logdir=/var/log \
--log=/var/log/unit.log \
--tmpdir=/var/tmp \
--user=unit \
--group=unit \
--openssl \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
--njs" \
&& 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 \
&& export RUST_VERSION=1.71.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="0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db" ;; \
arm64) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800" ;; \
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
esac \
&& url="https://static.rust-lang.org/rustup/archive/1.26.0/${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 \
&& make -C pkg/contrib .wasmtime \
&& install -pm 755 pkg/contrib/wasmtime/target/release/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 \
&& ./configure wasm --include-path=`pwd`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=/usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ \
&& make -j $NCPU wasm-install \
&& make clean \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
&& ./configure wasm --include-path=`pwd`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=/usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ \
&& make -j $NCPU wasm-install \
&& cd \
&& rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
done \
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
&& /bin/true \
&& mkdir -p /var/lib/unit/ \
&& mkdir -p /docker-entrypoint.d/ \
&& groupadd --gid 999 unit \
&& useradd \
--uid 999 \
--gid unit \
--no-create-home \
--home /nonexistent \
--comment "unit user" \
--shell /bin/false \
unit \
&& apt-get update \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get purge -y --auto-remove build-essential \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \
&& ln -sf /dev/stdout /var/log/unit.log
COPY docker-entrypoint.sh /usr/local/bin/
COPY welcome.* /usr/share/unit/welcome/
STOPSIGNAL SIGTERM
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
EXPOSE 80
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]