diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2023-02-13 17:04:24 -0800 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2023-02-13 17:04:24 -0800 |
| commit | 054518bb360e4be6d4892025c02c811872d93e99 (patch) | |
| tree | 68b0017e53f8ff098610e2a68d65ba83347721bb /pkg/docker/template.Dockerfile | |
| parent | eb47174875b9add0a2171c2f1a00ecb8435f496f (diff) | |
| download | unit-054518bb360e4be6d4892025c02c811872d93e99.tar.gz unit-054518bb360e4be6d4892025c02c811872d93e99.tar.bz2 | |
Docker: made dockerfiles use a single stage build process.
Diffstat (limited to '')
| -rw-r--r-- | pkg/docker/template.Dockerfile | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/pkg/docker/template.Dockerfile b/pkg/docker/template.Dockerfile index 29419902..6037729c 100644 --- a/pkg/docker/template.Dockerfile +++ b/pkg/docker/template.Dockerfile @@ -3,6 +3,7 @@ FROM @@CONTAINER@@ as BUILDER LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" 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 \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ @@ -38,20 +39,12 @@ RUN set -ex \ && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \ && ./configure @@CONFIGURE@@ \ && make -j $NCPU @@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 @@CONTAINER@@ -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@@ -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 \ + && 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; } \ + && @@RUN@@ \ && mkdir -p /var/lib/unit/ \ && mkdir /docker-entrypoint.d/ \ && addgroup --system unit \ @@ -64,12 +57,15 @@ RUN set -x \ --gecos "unit user" \ --shell /bin/false \ unit \ - && apt update \ - && apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \ + && apt-get update \ + && apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \ + && apt-get purge -y --auto-remove \ && apt-get clean && 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/ + STOPSIGNAL SIGTERM ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] |