Regenerated dockerfiles.
This commit is contained in:
@@ -1,79 +0,0 @@
|
|||||||
FROM golang:1.19 as BUILDER
|
|
||||||
|
|
||||||
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
|
|
||||||
|
|
||||||
RUN set -ex \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
|
|
||||||
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
|
|
||||||
&& hg clone https://hg.nginx.org/unit \
|
|
||||||
&& cd unit \
|
|
||||||
&& hg up 1.29.1 \
|
|
||||||
&& 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="--prefix=/usr \
|
|
||||||
--state=/var/lib/unit \
|
|
||||||
--control=unix:/var/run/control.unit.sock \
|
|
||||||
--pid=/var/run/unit.pid \
|
|
||||||
--log=/var/log/unit.log \
|
|
||||||
--tmp=/var/tmp \
|
|
||||||
--user=unit \
|
|
||||||
--group=unit \
|
|
||||||
--openssl \
|
|
||||||
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
|
|
||||||
&& make -j $NCPU unitd \
|
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd-debug \
|
|
||||||
&& make clean \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
|
|
||||||
&& make -j $NCPU unitd \
|
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd \
|
|
||||||
&& make clean \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
|
|
||||||
&& ./configure go --go-path=$GOPATH \
|
|
||||||
&& make -j $NCPU go-install-src libunit-install \
|
|
||||||
&& make clean \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
|
|
||||||
&& ./configure go --go-path=$GOPATH \
|
|
||||||
&& make -j $NCPU go-install-src libunit-install \
|
|
||||||
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
|
|
||||||
|
|
||||||
FROM golang:1.19
|
|
||||||
COPY docker-entrypoint.sh /usr/local/bin/
|
|
||||||
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
|
|
||||||
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
|
|
||||||
COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
|
|
||||||
COPY --from=BUILDER /requirements.apt /requirements.apt
|
|
||||||
COPY --from=BUILDER /usr/lib/*-linux-gnu/libunit.a /tmp/
|
|
||||||
COPY --from=BUILDER /usr/include/nxt_* /usr/include/
|
|
||||||
COPY --from=BUILDER /go/src/ /go/src/
|
|
||||||
RUN set -x \
|
|
||||||
&& if [ -f "/tmp/libunit.a" ]; then \
|
|
||||||
mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
|
|
||||||
rm -f /tmp/libunit.a; \
|
|
||||||
fi \
|
|
||||||
&& mkdir -p /var/lib/unit/ \
|
|
||||||
&& mkdir /docker-entrypoint.d/ \
|
|
||||||
&& addgroup --system unit \
|
|
||||||
&& adduser \
|
|
||||||
--system \
|
|
||||||
--disabled-login \
|
|
||||||
--ingroup unit \
|
|
||||||
--no-create-home \
|
|
||||||
--home /nonexistent \
|
|
||||||
--gecos "unit user" \
|
|
||||||
--shell /bin/false \
|
|
||||||
unit \
|
|
||||||
&& apt update \
|
|
||||||
&& apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
|
|
||||||
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& rm -f /requirements.apt \
|
|
||||||
&& ln -sf /dev/stdout /var/log/unit.log
|
|
||||||
|
|
||||||
STOPSIGNAL SIGTERM
|
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
|
||||||
|
|
||||||
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
|
||||||
84
pkg/docker/Dockerfile.go1.20
Normal file
84
pkg/docker/Dockerfile.go1.20
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
FROM golang:1.20-bullseye
|
||||||
|
|
||||||
|
LABEL org.opencontainers.image.title="Unit"
|
||||||
|
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 \
|
||||||
|
&& 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 \
|
||||||
|
--pid=/var/run/unit.pid \
|
||||||
|
--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 \
|
||||||
|
&& ./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 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 /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 \
|
||||||
|
&& 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"]
|
||||||
@@ -1,77 +1,84 @@
|
|||||||
FROM eclipse-temurin:11-jdk as BUILDER
|
FROM eclipse-temurin:11-jdk-jammy
|
||||||
|
|
||||||
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
|
LABEL org.opencontainers.image.title="Unit"
|
||||||
|
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 \
|
RUN set -ex \
|
||||||
|
&& savedAptMark="$(apt-mark showmanual)" \
|
||||||
&& 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 \
|
&& 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 \
|
||||||
&& hg clone https://hg.nginx.org/unit \
|
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
|
||||||
&& cd unit \
|
&& cd unit \
|
||||||
&& hg up 1.29.1 \
|
|
||||||
&& 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)" \
|
||||||
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
|
&& 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)" \
|
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
|
||||||
&& CONFIGURE_ARGS="--prefix=/usr \
|
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
|
||||||
--state=/var/lib/unit \
|
--statedir=/var/lib/unit \
|
||||||
--control=unix:/var/run/control.unit.sock \
|
--control=unix:/var/run/control.unit.sock \
|
||||||
--pid=/var/run/unit.pid \
|
--pid=/var/run/unit.pid \
|
||||||
--log=/var/log/unit.log \
|
--log=/var/log/unit.log \
|
||||||
--tmp=/var/tmp \
|
--tmpdir=/var/tmp \
|
||||||
--user=unit \
|
--user=unit \
|
||||||
--group=unit \
|
--group=unit \
|
||||||
--openssl \
|
--openssl \
|
||||||
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
|
&& 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 \
|
&& make -j $NCPU unitd \
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd-debug \
|
&& install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
|
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
|
||||||
&& make -j $NCPU unitd \
|
&& make -j $NCPU unitd \
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd \
|
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/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 \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
|
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
|
||||||
&& ./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 \
|
||||||
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
|
&& cd \
|
||||||
|
&& rm -rf unit \
|
||||||
FROM eclipse-temurin:11-jdk
|
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
|
||||||
COPY docker-entrypoint.sh /usr/local/bin/
|
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
|
||||||
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
|
done \
|
||||||
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
|
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
|
||||||
COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
|
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
|
||||||
COPY --from=BUILDER /requirements.apt /requirements.apt
|
&& /bin/true \
|
||||||
COPY --from=BUILDER /usr/share/unit-jsc-common/ /usr/share/unit-jsc-common/
|
|
||||||
RUN set -x \
|
|
||||||
&& if [ -f "/tmp/libunit.a" ]; then \
|
|
||||||
mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
|
|
||||||
rm -f /tmp/libunit.a; \
|
|
||||||
fi \
|
|
||||||
&& mkdir -p /var/lib/unit/ \
|
&& mkdir -p /var/lib/unit/ \
|
||||||
&& mkdir /docker-entrypoint.d/ \
|
&& mkdir /docker-entrypoint.d/ \
|
||||||
&& addgroup --system unit \
|
&& groupadd --gid 999 unit \
|
||||||
&& adduser \
|
&& useradd \
|
||||||
--system \
|
--uid 999 \
|
||||||
--disabled-login \
|
--gid unit \
|
||||||
--ingroup unit \
|
|
||||||
--no-create-home \
|
--no-create-home \
|
||||||
--home /nonexistent \
|
--home /nonexistent \
|
||||||
--gecos "unit user" \
|
--comment "unit user" \
|
||||||
--shell /bin/false \
|
--shell /bin/false \
|
||||||
unit \
|
unit \
|
||||||
&& apt update \
|
&& apt-get update \
|
||||||
&& apt --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 clean && rm -rf /var/lib/apt/lists/* \
|
&& apt-get purge -y --auto-remove \
|
||||||
|
&& 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
|
||||||
|
|
||||||
|
COPY docker-entrypoint.sh /usr/local/bin/
|
||||||
|
COPY welcome.* /usr/share/unit/welcome/
|
||||||
|
|
||||||
STOPSIGNAL SIGTERM
|
STOPSIGNAL SIGTERM
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
||||||
|
EXPOSE 80
|
||||||
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
||||||
|
|||||||
@@ -1,77 +1,84 @@
|
|||||||
FROM debian:bullseye-slim as BUILDER
|
FROM debian:bullseye-slim
|
||||||
|
|
||||||
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
|
LABEL org.opencontainers.image.title="Unit"
|
||||||
|
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 \
|
RUN set -ex \
|
||||||
|
&& savedAptMark="$(apt-mark showmanual)" \
|
||||||
&& 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 \
|
&& 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 \
|
||||||
&& hg clone https://hg.nginx.org/unit \
|
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
|
||||||
&& cd unit \
|
&& cd unit \
|
||||||
&& hg up 1.29.1 \
|
|
||||||
&& 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)" \
|
||||||
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
|
&& 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)" \
|
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
|
||||||
&& CONFIGURE_ARGS="--prefix=/usr \
|
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
|
||||||
--state=/var/lib/unit \
|
--statedir=/var/lib/unit \
|
||||||
--control=unix:/var/run/control.unit.sock \
|
--control=unix:/var/run/control.unit.sock \
|
||||||
--pid=/var/run/unit.pid \
|
--pid=/var/run/unit.pid \
|
||||||
--log=/var/log/unit.log \
|
--log=/var/log/unit.log \
|
||||||
--tmp=/var/tmp \
|
--tmpdir=/var/tmp \
|
||||||
--user=unit \
|
--user=unit \
|
||||||
--group=unit \
|
--group=unit \
|
||||||
--openssl \
|
--openssl \
|
||||||
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
|
&& 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 \
|
&& make -j $NCPU unitd \
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd-debug \
|
&& install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
|
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
|
||||||
&& make -j $NCPU unitd \
|
&& make -j $NCPU unitd \
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd \
|
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/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 \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
|
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
|
||||||
&& ./configure \
|
&& ./configure \
|
||||||
&& make -j $NCPU version \
|
&& make -j $NCPU version \
|
||||||
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
|
&& cd \
|
||||||
|
&& rm -rf unit \
|
||||||
FROM debian:bullseye-slim
|
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
|
||||||
COPY docker-entrypoint.sh /usr/local/bin/
|
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
|
||||||
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
|
done \
|
||||||
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
|
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
|
||||||
COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
|
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
|
||||||
COPY --from=BUILDER /requirements.apt /requirements.apt
|
&& /bin/true \
|
||||||
|
|
||||||
RUN set -x \
|
|
||||||
&& if [ -f "/tmp/libunit.a" ]; then \
|
|
||||||
mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
|
|
||||||
rm -f /tmp/libunit.a; \
|
|
||||||
fi \
|
|
||||||
&& mkdir -p /var/lib/unit/ \
|
&& mkdir -p /var/lib/unit/ \
|
||||||
&& mkdir /docker-entrypoint.d/ \
|
&& mkdir /docker-entrypoint.d/ \
|
||||||
&& addgroup --system unit \
|
&& groupadd --gid 999 unit \
|
||||||
&& adduser \
|
&& useradd \
|
||||||
--system \
|
--uid 999 \
|
||||||
--disabled-login \
|
--gid unit \
|
||||||
--ingroup unit \
|
|
||||||
--no-create-home \
|
--no-create-home \
|
||||||
--home /nonexistent \
|
--home /nonexistent \
|
||||||
--gecos "unit user" \
|
--comment "unit user" \
|
||||||
--shell /bin/false \
|
--shell /bin/false \
|
||||||
unit \
|
unit \
|
||||||
&& apt update \
|
&& apt-get update \
|
||||||
&& apt --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 clean && rm -rf /var/lib/apt/lists/* \
|
&& apt-get purge -y --auto-remove \
|
||||||
|
&& 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
|
||||||
|
|
||||||
|
COPY docker-entrypoint.sh /usr/local/bin/
|
||||||
|
COPY welcome.* /usr/share/unit/welcome/
|
||||||
|
|
||||||
STOPSIGNAL SIGTERM
|
STOPSIGNAL SIGTERM
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
||||||
|
EXPOSE 80
|
||||||
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
||||||
|
|||||||
@@ -1,79 +1,84 @@
|
|||||||
FROM node:18 as BUILDER
|
FROM node:18-bullseye
|
||||||
|
|
||||||
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
|
LABEL org.opencontainers.image.title="Unit"
|
||||||
|
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 \
|
RUN set -ex \
|
||||||
|
&& savedAptMark="$(apt-mark showmanual)" \
|
||||||
&& 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 \
|
&& 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 \
|
||||||
&& hg clone https://hg.nginx.org/unit \
|
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
|
||||||
&& cd unit \
|
&& cd unit \
|
||||||
&& hg up 1.29.1 \
|
|
||||||
&& 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)" \
|
||||||
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
|
&& 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)" \
|
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
|
||||||
&& CONFIGURE_ARGS="--prefix=/usr \
|
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
|
||||||
--state=/var/lib/unit \
|
--statedir=/var/lib/unit \
|
||||||
--control=unix:/var/run/control.unit.sock \
|
--control=unix:/var/run/control.unit.sock \
|
||||||
--pid=/var/run/unit.pid \
|
--pid=/var/run/unit.pid \
|
||||||
--log=/var/log/unit.log \
|
--log=/var/log/unit.log \
|
||||||
--tmp=/var/tmp \
|
--tmpdir=/var/tmp \
|
||||||
--user=unit \
|
--user=unit \
|
||||||
--group=unit \
|
--group=unit \
|
||||||
--openssl \
|
--openssl \
|
||||||
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
|
&& 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 \
|
&& make -j $NCPU unitd \
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd-debug \
|
&& install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
|
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
|
||||||
&& make -j $NCPU unitd \
|
&& make -j $NCPU unitd \
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd \
|
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/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/lib/node_modules/npm/bin/node-gyp-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 --cc-opt="$CC_OPT" --modules=/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/lib/node_modules/npm/bin/node-gyp-bin/node-gyp \
|
||||||
&& make -j $NCPU node node-install libunit-install \
|
&& make -j $NCPU node node-install libunit-install \
|
||||||
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
|
&& cd \
|
||||||
|
&& rm -rf unit \
|
||||||
FROM node:18
|
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
|
||||||
COPY docker-entrypoint.sh /usr/local/bin/
|
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
|
||||||
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
|
done \
|
||||||
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
|
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
|
||||||
COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
|
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
|
||||||
COPY --from=BUILDER /requirements.apt /requirements.apt
|
&& /bin/true \
|
||||||
COPY --from=BUILDER /usr/lib/*-linux-gnu/libunit.a /tmp/
|
|
||||||
COPY --from=BUILDER /usr/include/nxt_* /usr/include/
|
|
||||||
COPY --from=BUILDER /usr/local/lib/node_modules/unit-http/ /usr/local/lib/node_modules/unit-http/
|
|
||||||
RUN set -x \
|
|
||||||
&& if [ -f "/tmp/libunit.a" ]; then \
|
|
||||||
mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
|
|
||||||
rm -f /tmp/libunit.a; \
|
|
||||||
fi \
|
|
||||||
&& mkdir -p /var/lib/unit/ \
|
&& mkdir -p /var/lib/unit/ \
|
||||||
&& mkdir /docker-entrypoint.d/ \
|
&& mkdir /docker-entrypoint.d/ \
|
||||||
&& addgroup --system unit \
|
&& groupadd --gid 999 unit \
|
||||||
&& adduser \
|
&& useradd \
|
||||||
--system \
|
--uid 999 \
|
||||||
--disabled-login \
|
--gid unit \
|
||||||
--ingroup unit \
|
|
||||||
--no-create-home \
|
--no-create-home \
|
||||||
--home /nonexistent \
|
--home /nonexistent \
|
||||||
--gecos "unit user" \
|
--comment "unit user" \
|
||||||
--shell /bin/false \
|
--shell /bin/false \
|
||||||
unit \
|
unit \
|
||||||
&& apt update \
|
&& apt-get update \
|
||||||
&& apt --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 clean && rm -rf /var/lib/apt/lists/* \
|
&& apt-get purge -y --auto-remove \
|
||||||
|
&& 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
|
||||||
|
|
||||||
|
COPY docker-entrypoint.sh /usr/local/bin/
|
||||||
|
COPY welcome.* /usr/share/unit/welcome/
|
||||||
|
|
||||||
STOPSIGNAL SIGTERM
|
STOPSIGNAL SIGTERM
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
||||||
|
EXPOSE 80
|
||||||
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
||||||
|
|||||||
@@ -1,77 +1,84 @@
|
|||||||
FROM perl:5.36 as BUILDER
|
FROM perl:5.36-bullseye
|
||||||
|
|
||||||
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
|
LABEL org.opencontainers.image.title="Unit"
|
||||||
|
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 \
|
RUN set -ex \
|
||||||
|
&& savedAptMark="$(apt-mark showmanual)" \
|
||||||
&& 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 \
|
&& 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 \
|
||||||
&& hg clone https://hg.nginx.org/unit \
|
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
|
||||||
&& cd unit \
|
&& cd unit \
|
||||||
&& hg up 1.29.1 \
|
|
||||||
&& 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)" \
|
||||||
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
|
&& 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)" \
|
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
|
||||||
&& CONFIGURE_ARGS="--prefix=/usr \
|
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
|
||||||
--state=/var/lib/unit \
|
--statedir=/var/lib/unit \
|
||||||
--control=unix:/var/run/control.unit.sock \
|
--control=unix:/var/run/control.unit.sock \
|
||||||
--pid=/var/run/unit.pid \
|
--pid=/var/run/unit.pid \
|
||||||
--log=/var/log/unit.log \
|
--log=/var/log/unit.log \
|
||||||
--tmp=/var/tmp \
|
--tmpdir=/var/tmp \
|
||||||
--user=unit \
|
--user=unit \
|
||||||
--group=unit \
|
--group=unit \
|
||||||
--openssl \
|
--openssl \
|
||||||
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
|
&& 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 \
|
&& make -j $NCPU unitd \
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd-debug \
|
&& install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
|
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
|
||||||
&& make -j $NCPU unitd \
|
&& make -j $NCPU unitd \
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd \
|
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/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 \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
|
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
|
||||||
&& ./configure perl \
|
&& ./configure perl \
|
||||||
&& make -j $NCPU perl-install \
|
&& make -j $NCPU perl-install \
|
||||||
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
|
&& cd \
|
||||||
|
&& rm -rf unit \
|
||||||
FROM perl:5.36
|
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
|
||||||
COPY docker-entrypoint.sh /usr/local/bin/
|
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
|
||||||
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
|
done \
|
||||||
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
|
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
|
||||||
COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
|
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
|
||||||
COPY --from=BUILDER /requirements.apt /requirements.apt
|
&& /bin/true \
|
||||||
|
|
||||||
RUN set -x \
|
|
||||||
&& if [ -f "/tmp/libunit.a" ]; then \
|
|
||||||
mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
|
|
||||||
rm -f /tmp/libunit.a; \
|
|
||||||
fi \
|
|
||||||
&& mkdir -p /var/lib/unit/ \
|
&& mkdir -p /var/lib/unit/ \
|
||||||
&& mkdir /docker-entrypoint.d/ \
|
&& mkdir /docker-entrypoint.d/ \
|
||||||
&& addgroup --system unit \
|
&& groupadd --gid 999 unit \
|
||||||
&& adduser \
|
&& useradd \
|
||||||
--system \
|
--uid 999 \
|
||||||
--disabled-login \
|
--gid unit \
|
||||||
--ingroup unit \
|
|
||||||
--no-create-home \
|
--no-create-home \
|
||||||
--home /nonexistent \
|
--home /nonexistent \
|
||||||
--gecos "unit user" \
|
--comment "unit user" \
|
||||||
--shell /bin/false \
|
--shell /bin/false \
|
||||||
unit \
|
unit \
|
||||||
&& apt update \
|
&& apt-get update \
|
||||||
&& apt --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 clean && rm -rf /var/lib/apt/lists/* \
|
&& apt-get purge -y --auto-remove \
|
||||||
|
&& 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
|
||||||
|
|
||||||
|
COPY docker-entrypoint.sh /usr/local/bin/
|
||||||
|
COPY welcome.* /usr/share/unit/welcome/
|
||||||
|
|
||||||
STOPSIGNAL SIGTERM
|
STOPSIGNAL SIGTERM
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
||||||
|
EXPOSE 80
|
||||||
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
||||||
|
|||||||
@@ -1,77 +0,0 @@
|
|||||||
FROM php:8.1-cli as BUILDER
|
|
||||||
|
|
||||||
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
|
|
||||||
|
|
||||||
RUN set -ex \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
|
|
||||||
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
|
|
||||||
&& hg clone https://hg.nginx.org/unit \
|
|
||||||
&& cd unit \
|
|
||||||
&& hg up 1.29.1 \
|
|
||||||
&& 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="--prefix=/usr \
|
|
||||||
--state=/var/lib/unit \
|
|
||||||
--control=unix:/var/run/control.unit.sock \
|
|
||||||
--pid=/var/run/unit.pid \
|
|
||||||
--log=/var/log/unit.log \
|
|
||||||
--tmp=/var/tmp \
|
|
||||||
--user=unit \
|
|
||||||
--group=unit \
|
|
||||||
--openssl \
|
|
||||||
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
|
|
||||||
&& make -j $NCPU unitd \
|
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd-debug \
|
|
||||||
&& make clean \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
|
|
||||||
&& make -j $NCPU unitd \
|
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd \
|
|
||||||
&& make clean \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
|
|
||||||
&& ./configure php \
|
|
||||||
&& make -j $NCPU php-install \
|
|
||||||
&& make clean \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
|
|
||||||
&& ./configure php \
|
|
||||||
&& make -j $NCPU php-install \
|
|
||||||
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
|
|
||||||
|
|
||||||
FROM php:8.1-cli
|
|
||||||
COPY docker-entrypoint.sh /usr/local/bin/
|
|
||||||
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
|
|
||||||
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
|
|
||||||
COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
|
|
||||||
COPY --from=BUILDER /requirements.apt /requirements.apt
|
|
||||||
RUN ldconfig
|
|
||||||
RUN set -x \
|
|
||||||
&& if [ -f "/tmp/libunit.a" ]; then \
|
|
||||||
mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
|
|
||||||
rm -f /tmp/libunit.a; \
|
|
||||||
fi \
|
|
||||||
&& mkdir -p /var/lib/unit/ \
|
|
||||||
&& mkdir /docker-entrypoint.d/ \
|
|
||||||
&& addgroup --system unit \
|
|
||||||
&& adduser \
|
|
||||||
--system \
|
|
||||||
--disabled-login \
|
|
||||||
--ingroup unit \
|
|
||||||
--no-create-home \
|
|
||||||
--home /nonexistent \
|
|
||||||
--gecos "unit user" \
|
|
||||||
--shell /bin/false \
|
|
||||||
unit \
|
|
||||||
&& apt update \
|
|
||||||
&& apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
|
|
||||||
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& rm -f /requirements.apt \
|
|
||||||
&& ln -sf /dev/stdout /var/log/unit.log
|
|
||||||
|
|
||||||
STOPSIGNAL SIGTERM
|
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
|
||||||
|
|
||||||
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
|
||||||
84
pkg/docker/Dockerfile.php8.2
Normal file
84
pkg/docker/Dockerfile.php8.2
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
FROM php:8.2-cli-bullseye
|
||||||
|
|
||||||
|
LABEL org.opencontainers.image.title="Unit"
|
||||||
|
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 \
|
||||||
|
&& 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 \
|
||||||
|
--pid=/var/run/unit.pid \
|
||||||
|
--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 \
|
||||||
|
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
|
||||||
|
&& ./configure php \
|
||||||
|
&& make -j $NCPU php-install \
|
||||||
|
&& make clean \
|
||||||
|
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
|
||||||
|
&& ./configure php \
|
||||||
|
&& make -j $NCPU php-install \
|
||||||
|
&& cd \
|
||||||
|
&& rm -rf 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; } \
|
||||||
|
&& ldconfig \
|
||||||
|
&& mkdir -p /var/lib/unit/ \
|
||||||
|
&& mkdir /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 \
|
||||||
|
&& 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"]
|
||||||
@@ -1,77 +1,84 @@
|
|||||||
FROM python:3.11 as BUILDER
|
FROM python:3.11-bullseye
|
||||||
|
|
||||||
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
|
LABEL org.opencontainers.image.title="Unit"
|
||||||
|
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 \
|
RUN set -ex \
|
||||||
|
&& savedAptMark="$(apt-mark showmanual)" \
|
||||||
&& 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 \
|
&& 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 \
|
||||||
&& hg clone https://hg.nginx.org/unit \
|
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
|
||||||
&& cd unit \
|
&& cd unit \
|
||||||
&& hg up 1.29.1 \
|
|
||||||
&& 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)" \
|
||||||
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
|
&& 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)" \
|
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
|
||||||
&& CONFIGURE_ARGS="--prefix=/usr \
|
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
|
||||||
--state=/var/lib/unit \
|
--statedir=/var/lib/unit \
|
||||||
--control=unix:/var/run/control.unit.sock \
|
--control=unix:/var/run/control.unit.sock \
|
||||||
--pid=/var/run/unit.pid \
|
--pid=/var/run/unit.pid \
|
||||||
--log=/var/log/unit.log \
|
--log=/var/log/unit.log \
|
||||||
--tmp=/var/tmp \
|
--tmpdir=/var/tmp \
|
||||||
--user=unit \
|
--user=unit \
|
||||||
--group=unit \
|
--group=unit \
|
||||||
--openssl \
|
--openssl \
|
||||||
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
|
&& 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 \
|
&& make -j $NCPU unitd \
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd-debug \
|
&& install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
|
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
|
||||||
&& make -j $NCPU unitd \
|
&& make -j $NCPU unitd \
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd \
|
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/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 \
|
||||||
&& make clean \
|
&& make clean \
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
|
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
|
||||||
&& ./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 \
|
||||||
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
|
&& cd \
|
||||||
|
&& rm -rf unit \
|
||||||
FROM python:3.11
|
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
|
||||||
COPY docker-entrypoint.sh /usr/local/bin/
|
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
|
||||||
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
|
done \
|
||||||
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
|
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
|
||||||
COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
|
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
|
||||||
COPY --from=BUILDER /requirements.apt /requirements.apt
|
&& /bin/true \
|
||||||
|
|
||||||
RUN set -x \
|
|
||||||
&& if [ -f "/tmp/libunit.a" ]; then \
|
|
||||||
mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
|
|
||||||
rm -f /tmp/libunit.a; \
|
|
||||||
fi \
|
|
||||||
&& mkdir -p /var/lib/unit/ \
|
&& mkdir -p /var/lib/unit/ \
|
||||||
&& mkdir /docker-entrypoint.d/ \
|
&& mkdir /docker-entrypoint.d/ \
|
||||||
&& addgroup --system unit \
|
&& groupadd --gid 999 unit \
|
||||||
&& adduser \
|
&& useradd \
|
||||||
--system \
|
--uid 999 \
|
||||||
--disabled-login \
|
--gid unit \
|
||||||
--ingroup unit \
|
|
||||||
--no-create-home \
|
--no-create-home \
|
||||||
--home /nonexistent \
|
--home /nonexistent \
|
||||||
--gecos "unit user" \
|
--comment "unit user" \
|
||||||
--shell /bin/false \
|
--shell /bin/false \
|
||||||
unit \
|
unit \
|
||||||
&& apt update \
|
&& apt-get update \
|
||||||
&& apt --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 clean && rm -rf /var/lib/apt/lists/* \
|
&& apt-get purge -y --auto-remove \
|
||||||
|
&& 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
|
||||||
|
|
||||||
|
COPY docker-entrypoint.sh /usr/local/bin/
|
||||||
|
COPY welcome.* /usr/share/unit/welcome/
|
||||||
|
|
||||||
STOPSIGNAL SIGTERM
|
STOPSIGNAL SIGTERM
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
||||||
|
EXPOSE 80
|
||||||
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
||||||
|
|||||||
@@ -1,77 +0,0 @@
|
|||||||
FROM ruby:3.1 as BUILDER
|
|
||||||
|
|
||||||
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
|
|
||||||
|
|
||||||
RUN set -ex \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
|
|
||||||
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
|
|
||||||
&& hg clone https://hg.nginx.org/unit \
|
|
||||||
&& cd unit \
|
|
||||||
&& hg up 1.29.1 \
|
|
||||||
&& 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="--prefix=/usr \
|
|
||||||
--state=/var/lib/unit \
|
|
||||||
--control=unix:/var/run/control.unit.sock \
|
|
||||||
--pid=/var/run/unit.pid \
|
|
||||||
--log=/var/log/unit.log \
|
|
||||||
--tmp=/var/tmp \
|
|
||||||
--user=unit \
|
|
||||||
--group=unit \
|
|
||||||
--openssl \
|
|
||||||
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
|
|
||||||
&& make -j $NCPU unitd \
|
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd-debug \
|
|
||||||
&& make clean \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
|
|
||||||
&& make -j $NCPU unitd \
|
|
||||||
&& install -pm755 build/unitd /usr/sbin/unitd \
|
|
||||||
&& make clean \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
|
|
||||||
&& ./configure ruby \
|
|
||||||
&& make -j $NCPU ruby-install \
|
|
||||||
&& make clean \
|
|
||||||
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
|
|
||||||
&& ./configure ruby \
|
|
||||||
&& make -j $NCPU ruby-install \
|
|
||||||
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
|
|
||||||
|
|
||||||
FROM ruby:3.1
|
|
||||||
COPY docker-entrypoint.sh /usr/local/bin/
|
|
||||||
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
|
|
||||||
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
|
|
||||||
COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
|
|
||||||
COPY --from=BUILDER /requirements.apt /requirements.apt
|
|
||||||
RUN gem install rack
|
|
||||||
RUN set -x \
|
|
||||||
&& if [ -f "/tmp/libunit.a" ]; then \
|
|
||||||
mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
|
|
||||||
rm -f /tmp/libunit.a; \
|
|
||||||
fi \
|
|
||||||
&& mkdir -p /var/lib/unit/ \
|
|
||||||
&& mkdir /docker-entrypoint.d/ \
|
|
||||||
&& addgroup --system unit \
|
|
||||||
&& adduser \
|
|
||||||
--system \
|
|
||||||
--disabled-login \
|
|
||||||
--ingroup unit \
|
|
||||||
--no-create-home \
|
|
||||||
--home /nonexistent \
|
|
||||||
--gecos "unit user" \
|
|
||||||
--shell /bin/false \
|
|
||||||
unit \
|
|
||||||
&& apt update \
|
|
||||||
&& apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
|
|
||||||
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& rm -f /requirements.apt \
|
|
||||||
&& ln -sf /dev/stdout /var/log/unit.log
|
|
||||||
|
|
||||||
STOPSIGNAL SIGTERM
|
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
|
||||||
|
|
||||||
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
|
|
||||||
84
pkg/docker/Dockerfile.ruby3.2
Normal file
84
pkg/docker/Dockerfile.ruby3.2
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
FROM ruby:3.2-bullseye
|
||||||
|
|
||||||
|
LABEL org.opencontainers.image.title="Unit"
|
||||||
|
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 \
|
||||||
|
&& 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 \
|
||||||
|
--pid=/var/run/unit.pid \
|
||||||
|
--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 \
|
||||||
|
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
|
||||||
|
&& ./configure ruby \
|
||||||
|
&& make -j $NCPU ruby-install \
|
||||||
|
&& make clean \
|
||||||
|
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
|
||||||
|
&& ./configure ruby \
|
||||||
|
&& make -j $NCPU ruby-install \
|
||||||
|
&& cd \
|
||||||
|
&& rm -rf 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; } \
|
||||||
|
&& gem install rack \
|
||||||
|
&& mkdir -p /var/lib/unit/ \
|
||||||
|
&& mkdir /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 \
|
||||||
|
&& 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"]
|
||||||
Reference in New Issue
Block a user