Skip to content

Commit 22fe086

Browse files
thresheekthresheek
committed
Regenerated Dockerfiles.
1 parent 2beeb81 commit 22fe086

File tree

8 files changed

+99
-135
lines changed

8 files changed

+99
-135
lines changed

‎pkg/docker/Dockerfile.go1.19 renamed to ‎pkg/docker/Dockerfile.go1.20

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM golang:1.19 as BUILDER
1+
FROM golang:1.20 as BUILDER
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

55
RUN set -ex \
6+
&& savedAptMark="$(apt-mark showmanual)" \
67
&& apt-get update \
78
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
89
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
@@ -38,22 +39,12 @@ RUN set -ex \
3839
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
3940
&& ./configure go --go-path=$GOPATH \
4041
&& make -j $NCPU go-install-src libunit-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 golang:1.19
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/lib/*-linux-gnu/libunit.a /tmp/
50-
COPY --from=BUILDER /usr/include/nxt_* /usr/include/
51-
COPY --from=BUILDER /go/src/ /go/src/
52-
RUN set -x \
53-
&& if [ -f "/tmp/libunit.a" ]; then \
54-
mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
55-
rm -f /tmp/libunit.a; \
56-
fi \
42+
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
43+
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
44+
done \
45+
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
46+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
47+
&& /bin/true \
5748
&& mkdir -p /var/lib/unit/ \
5849
&& mkdir /docker-entrypoint.d/ \
5950
&& addgroup --system unit \
@@ -66,12 +57,15 @@ RUN set -x \
6657
--gecos "unit user" \
6758
--shell /bin/false \
6859
unit \
69-
&& apt update \
70-
&& apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
60+
&& apt-get update \
61+
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
62+
&& apt-get purge -y --auto-remove \
7163
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
7264
&& rm -f /requirements.apt \
7365
&& ln -sf /dev/stdout /var/log/unit.log
7466

67+
COPY docker-entrypoint.sh /usr/local/bin/
68+
7569
STOPSIGNAL SIGTERM
7670

7771
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

‎pkg/docker/Dockerfile.jsc11

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM eclipse-temurin:11-jdk as BUILDER
33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

55
RUN set -ex \
6+
&& savedAptMark="$(apt-mark showmanual)" \
67
&& apt-get update \
78
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
89
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
@@ -38,20 +39,12 @@ RUN set -ex \
3839
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
3940
&& ./configure java --jars=/usr/share/unit-jsc-common/ \
4041
&& 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 \
42+
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
43+
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
44+
done \
45+
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
46+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
47+
&& /bin/true \
5548
&& mkdir -p /var/lib/unit/ \
5649
&& mkdir /docker-entrypoint.d/ \
5750
&& addgroup --system unit \
@@ -64,12 +57,15 @@ RUN set -x \
6457
--gecos "unit user" \
6558
--shell /bin/false \
6659
unit \
67-
&& apt update \
68-
&& apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
60+
&& apt-get update \
61+
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
62+
&& apt-get purge -y --auto-remove \
6963
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
7064
&& rm -f /requirements.apt \
7165
&& ln -sf /dev/stdout /var/log/unit.log
7266

67+
COPY docker-entrypoint.sh /usr/local/bin/
68+
7369
STOPSIGNAL SIGTERM
7470

7571
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

‎pkg/docker/Dockerfile.minimal

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM debian:bullseye-slim as BUILDER
33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

55
RUN set -ex \
6+
&& savedAptMark="$(apt-mark showmanual)" \
67
&& apt-get update \
78
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
89
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
@@ -38,20 +39,12 @@ RUN set -ex \
3839
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
3940
&& ./configure \
4041
&& make -j $NCPU version \
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 debian:bullseye-slim
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-
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 \
42+
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
43+
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
44+
done \
45+
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
46+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
47+
&& /bin/true \
5548
&& mkdir -p /var/lib/unit/ \
5649
&& mkdir /docker-entrypoint.d/ \
5750
&& addgroup --system unit \
@@ -64,12 +57,15 @@ RUN set -x \
6457
--gecos "unit user" \
6558
--shell /bin/false \
6659
unit \
67-
&& apt update \
68-
&& apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
60+
&& apt-get update \
61+
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
62+
&& apt-get purge -y --auto-remove \
6963
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
7064
&& rm -f /requirements.apt \
7165
&& ln -sf /dev/stdout /var/log/unit.log
7266

67+
COPY docker-entrypoint.sh /usr/local/bin/
68+
7369
STOPSIGNAL SIGTERM
7470

7571
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

‎pkg/docker/Dockerfile.node18

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM node:18 as BUILDER
33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

55
RUN set -ex \
6+
&& savedAptMark="$(apt-mark showmanual)" \
67
&& apt-get update \
78
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
89
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
@@ -38,22 +39,12 @@ RUN set -ex \
3839
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
3940
&& ./configure nodejs --node-gyp=/usr/local/lib/node_modules/npm/bin/node-gyp-bin/node-gyp \
4041
&& make -j $NCPU node node-install libunit-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 node:18
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/lib/*-linux-gnu/libunit.a /tmp/
50-
COPY --from=BUILDER /usr/include/nxt_* /usr/include/
51-
COPY --from=BUILDER /usr/local/lib/node_modules/unit-http/ /usr/local/lib/node_modules/unit-http/
52-
RUN set -x \
53-
&& if [ -f "/tmp/libunit.a" ]; then \
54-
mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
55-
rm -f /tmp/libunit.a; \
56-
fi \
42+
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
43+
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
44+
done \
45+
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
46+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
47+
&& /bin/true \
5748
&& mkdir -p /var/lib/unit/ \
5849
&& mkdir /docker-entrypoint.d/ \
5950
&& addgroup --system unit \
@@ -66,12 +57,15 @@ RUN set -x \
6657
--gecos "unit user" \
6758
--shell /bin/false \
6859
unit \
69-
&& apt update \
70-
&& apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
60+
&& apt-get update \
61+
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
62+
&& apt-get purge -y --auto-remove \
7163
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
7264
&& rm -f /requirements.apt \
7365
&& ln -sf /dev/stdout /var/log/unit.log
7466

67+
COPY docker-entrypoint.sh /usr/local/bin/
68+
7569
STOPSIGNAL SIGTERM
7670

7771
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

‎pkg/docker/Dockerfile.perl5.36

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM perl:5.36 as BUILDER
33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

55
RUN set -ex \
6+
&& savedAptMark="$(apt-mark showmanual)" \
67
&& apt-get update \
78
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
89
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
@@ -38,20 +39,12 @@ RUN set -ex \
3839
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
3940
&& ./configure perl \
4041
&& make -j $NCPU perl-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 perl:5.36
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-
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 \
42+
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
43+
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
44+
done \
45+
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
46+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
47+
&& /bin/true \
5548
&& mkdir -p /var/lib/unit/ \
5649
&& mkdir /docker-entrypoint.d/ \
5750
&& addgroup --system unit \
@@ -64,12 +57,15 @@ RUN set -x \
6457
--gecos "unit user" \
6558
--shell /bin/false \
6659
unit \
67-
&& apt update \
68-
&& apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
60+
&& apt-get update \
61+
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
62+
&& apt-get purge -y --auto-remove \
6963
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
7064
&& rm -f /requirements.apt \
7165
&& ln -sf /dev/stdout /var/log/unit.log
7266

67+
COPY docker-entrypoint.sh /usr/local/bin/
68+
7369
STOPSIGNAL SIGTERM
7470

7571
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

‎pkg/docker/Dockerfile.php8.1 renamed to ‎pkg/docker/Dockerfile.php8.2

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM php:8.1-cli as BUILDER
1+
FROM php:8.2-cli as BUILDER
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

55
RUN set -ex \
6+
&& savedAptMark="$(apt-mark showmanual)" \
67
&& apt-get update \
78
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
89
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
@@ -38,20 +39,12 @@ RUN set -ex \
3839
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
3940
&& ./configure php \
4041
&& make -j $NCPU php-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 php:8.1-cli
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-
RUN ldconfig
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 \
42+
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
43+
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
44+
done \
45+
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
46+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
47+
&& ldconfig \
5548
&& mkdir -p /var/lib/unit/ \
5649
&& mkdir /docker-entrypoint.d/ \
5750
&& addgroup --system unit \
@@ -64,12 +57,15 @@ RUN set -x \
6457
--gecos "unit user" \
6558
--shell /bin/false \
6659
unit \
67-
&& apt update \
68-
&& apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
60+
&& apt-get update \
61+
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
62+
&& apt-get purge -y --auto-remove \
6963
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
7064
&& rm -f /requirements.apt \
7165
&& ln -sf /dev/stdout /var/log/unit.log
7266

67+
COPY docker-entrypoint.sh /usr/local/bin/
68+
7369
STOPSIGNAL SIGTERM
7470

7571
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

‎pkg/docker/Dockerfile.python3.11

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM python:3.11 as BUILDER
33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

55
RUN set -ex \
6+
&& savedAptMark="$(apt-mark showmanual)" \
67
&& apt-get update \
78
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
89
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
@@ -38,20 +39,12 @@ RUN set -ex \
3839
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
3940
&& ./configure python --config=/usr/local/bin/python3-config \
4041
&& make -j $NCPU python3-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 python:3.11
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-
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 \
42+
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
43+
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
44+
done \
45+
&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
46+
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
47+
&& /bin/true \
5548
&& mkdir -p /var/lib/unit/ \
5649
&& mkdir /docker-entrypoint.d/ \
5750
&& addgroup --system unit \
@@ -64,12 +57,15 @@ RUN set -x \
6457
--gecos "unit user" \
6558
--shell /bin/false \
6659
unit \
67-
&& apt update \
68-
&& apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
60+
&& apt-get update \
61+
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
62+
&& apt-get purge -y --auto-remove \
6963
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
7064
&& rm -f /requirements.apt \
7165
&& ln -sf /dev/stdout /var/log/unit.log
7266

67+
COPY docker-entrypoint.sh /usr/local/bin/
68+
7369
STOPSIGNAL SIGTERM
7470

7571
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

0 commit comments

Comments
 (0)