diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2022-05-11 13:06:17 +0400 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2022-05-11 13:06:17 +0400 |
| commit | 1fe389c2e216f21ba12ac7e373bcc26e43bde710 (patch) | |
| tree | 871c1573b0a3f2f05b3bc78f355060f73d2a0a51 /pkg/docker/Dockerfile.go1.18 | |
| parent | 967fa8f78afd0cd960e0159e61dbbe9ca8eabf91 (diff) | |
| download | unit-1fe389c2e216f21ba12ac7e373bcc26e43bde710.tar.gz unit-1fe389c2e216f21ba12ac7e373bcc26e43bde710.tar.bz2 | |
Regenerated Dockerfiles.
Diffstat (limited to '')
| -rw-r--r-- | pkg/docker/Dockerfile.go1.18 (renamed from pkg/docker/Dockerfile.go1.17) | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkg/docker/Dockerfile.go1.17 b/pkg/docker/Dockerfile.go1.18 index e7443e8c..f76fd229 100644 --- a/pkg/docker/Dockerfile.go1.17 +++ b/pkg/docker/Dockerfile.go1.18 @@ -1,4 +1,4 @@ -FROM golang:1.17 as BUILDER +FROM golang:1.18 as BUILDER LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" @@ -40,16 +40,20 @@ RUN set -ex \ && 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.17 +FROM golang:1.18 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/x86_64-linux-gnu/libunit.a /usr/lib/x86_64-linux-gnu/ +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 \ |