Skip to content

Commit dc03914

Browse files
thresheekthresheek
committed
Regenerated dockerfiles.
1 parent d481801 commit dc03914

11 files changed

+477
-425
lines changed

‎pkg/docker/Dockerfile.go1.19

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎pkg/docker/Dockerfile.go1.20

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
FROM golang:1.20-bullseye
2+
3+
LABEL org.opencontainers.image.title="Unit"
4+
LABEL org.opencontainers.image.description="Official build of Unit for Docker."
5+
LABEL org.opencontainers.image.url="https://unit.nginx.org"
6+
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
7+
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
8+
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <docker-maint@nginx.com>"
9+
LABEL org.opencontainers.image.version="1.30.0"
10+
11+
RUN set -ex \
12+
&& savedAptMark="$(apt-mark showmanual)" \
13+
&& apt-get update \
14+
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
15+
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
16+
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
17+
&& cd unit \
18+
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
19+
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
20+
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
21+
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
22+
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
23+
--statedir=/var/lib/unit \
24+
--control=unix:/var/run/control.unit.sock \
25+
--pid=/var/run/unit.pid \
26+
--log=/var/log/unit.log \
27+
--tmpdir=/var/tmp \
28+
--user=unit \
29+
--group=unit \
30+
--openssl \
31+
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
32+
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
33+
--njs" \
34+
&& make -j $NCPU -C pkg/contrib .njs \
35+
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
36+
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
37+
&& make -j $NCPU unitd \
38+
&& install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \
39+
&& make clean \
40+
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
41+
&& make -j $NCPU unitd \
42+
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \
43+
&& make clean \
44+
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
45+
&& ./configure go --go-path=$GOPATH \
46+
&& make -j $NCPU go-install-src libunit-install \
47+
&& make clean \
48+
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
49+
&& ./configure go --go-path=$GOPATH \
50+
&& make -j $NCPU go-install-src libunit-install \
51+
&& cd \
52+
&& rm -rf unit \
53+
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
54+
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
55+
done \
56+
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
57+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
58+
&& /bin/true \
59+
&& mkdir -p /var/lib/unit/ \
60+
&& mkdir /docker-entrypoint.d/ \
61+
&& groupadd --gid 999 unit \
62+
&& useradd \
63+
--uid 999 \
64+
--gid unit \
65+
--no-create-home \
66+
--home /nonexistent \
67+
--comment "unit user" \
68+
--shell /bin/false \
69+
unit \
70+
&& apt-get update \
71+
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
72+
&& apt-get purge -y --auto-remove \
73+
&& rm -rf /var/lib/apt/lists/* \
74+
&& rm -f /requirements.apt \
75+
&& ln -sf /dev/stdout /var/log/unit.log
76+
77+
COPY docker-entrypoint.sh /usr/local/bin/
78+
COPY welcome.* /usr/share/unit/welcome/
79+
80+
STOPSIGNAL SIGTERM
81+
82+
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
83+
EXPOSE 80
84+
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]

‎pkg/docker/Dockerfile.jsc11

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,84 @@
1-
FROM eclipse-temurin:11-jdk as BUILDER
1+
FROM eclipse-temurin:11-jdk-jammy
22

3-
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
3+
LABEL org.opencontainers.image.title="Unit"
4+
LABEL org.opencontainers.image.description="Official build of Unit for Docker."
5+
LABEL org.opencontainers.image.url="https://unit.nginx.org"
6+
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
7+
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
8+
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <docker-maint@nginx.com>"
9+
LABEL org.opencontainers.image.version="1.30.0"
410

511
RUN set -ex \
12+
&& savedAptMark="$(apt-mark showmanual)" \
613
&& apt-get update \
7-
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
14+
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev curl pkg-config \
815
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
9-
&& hg clone https://hg.nginx.org/unit \
16+
&& hg clone -u 1.30.0-1 https://hg.nginx.org/unit \
1017
&& cd unit \
11-
&& hg up 1.29.1 \
1218
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
1319
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
1420
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
1521
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
16-
&& CONFIGURE_ARGS="--prefix=/usr \
17-
--state=/var/lib/unit \
22+
&& CONFIGURE_ARGS_MODULES="--prefix=/usr \
23+
--statedir=/var/lib/unit \
1824
--control=unix:/var/run/control.unit.sock \
1925
--pid=/var/run/unit.pid \
2026
--log=/var/log/unit.log \
21-
--tmp=/var/tmp \
27+
--tmpdir=/var/tmp \
2228
--user=unit \
2329
--group=unit \
2430
--openssl \
2531
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
26-
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
32+
&& CONFIGURE_ARGS="$CONFIGURE_ARGS_MODULES \
33+
--njs" \
34+
&& make -j $NCPU -C pkg/contrib .njs \
35+
&& export PKG_CONFIG_PATH=$(pwd)/pkg/contrib/njs/build \
36+
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
2737
&& make -j $NCPU unitd \
28-
&& install -pm755 build/unitd /usr/sbin/unitd-debug \
38+
&& install -pm755 build/sbin/unitd /usr/sbin/unitd-debug \
2939
&& make clean \
30-
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
40+
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
3141
&& make -j $NCPU unitd \
32-
&& install -pm755 build/unitd /usr/sbin/unitd \
42+
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \
3343
&& make clean \
34-
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
44+
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
3545
&& ./configure java --jars=/usr/share/unit-jsc-common/ \
3646
&& make -j $NCPU java-shared-install java-install \
3747
&& make clean \
38-
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
48+
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
3949
&& ./configure java --jars=/usr/share/unit-jsc-common/ \
4050
&& make -j $NCPU java-shared-install java-install \
41-
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
42-
43-
FROM eclipse-temurin:11-jdk
44-
COPY docker-entrypoint.sh /usr/local/bin/
45-
COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
46-
COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
47-
COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
48-
COPY --from=BUILDER /requirements.apt /requirements.apt
49-
COPY --from=BUILDER /usr/share/unit-jsc-common/ /usr/share/unit-jsc-common/
50-
RUN set -x \
51-
&& if [ -f "/tmp/libunit.a" ]; then \
52-
mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
53-
rm -f /tmp/libunit.a; \
54-
fi \
51+
&& cd \
52+
&& rm -rf unit \
53+
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
54+
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
55+
done \
56+
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
57+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
58+
&& /bin/true \
5559
&& mkdir -p /var/lib/unit/ \
5660
&& mkdir /docker-entrypoint.d/ \
57-
&& addgroup --system unit \
58-
&& adduser \
59-
--system \
60-
--disabled-login \
61-
--ingroup unit \
61+
&& groupadd --gid 999 unit \
62+
&& useradd \
63+
--uid 999 \
64+
--gid unit \
6265
--no-create-home \
6366
--home /nonexistent \
64-
--gecos "unit user" \
67+
--comment "unit user" \
6568
--shell /bin/false \
6669
unit \
67-
&& apt update \
68-
&& apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
69-
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
70+
&& apt-get update \
71+
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
72+
&& apt-get purge -y --auto-remove \
73+
&& rm -rf /var/lib/apt/lists/* \
7074
&& rm -f /requirements.apt \
7175
&& ln -sf /dev/stdout /var/log/unit.log
7276

77+
COPY docker-entrypoint.sh /usr/local/bin/
78+
COPY welcome.* /usr/share/unit/welcome/
79+
7380
STOPSIGNAL SIGTERM
7481

7582
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
76-
83+
EXPOSE 80
7784
CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]

0 commit comments

Comments
 (0)