From 4924bd185db2c2717bf0ef6d0403c6594c1f7789 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Fri, 9 Sep 2022 17:45:58 +0400 Subject: [PATCH] Regenerated Dockerfiles. --- pkg/docker/{Dockerfile.go1.18 => Dockerfile.go1.19} | 4 ++-- pkg/docker/Dockerfile.jsc11 | 4 ++-- pkg/docker/{Dockerfile.perl5.34 => Dockerfile.perl5.36} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename pkg/docker/{Dockerfile.go1.18 => Dockerfile.go1.19} (98%) rename pkg/docker/{Dockerfile.perl5.34 => Dockerfile.perl5.36} (98%) diff --git a/pkg/docker/Dockerfile.go1.18 b/pkg/docker/Dockerfile.go1.19 similarity index 98% rename from pkg/docker/Dockerfile.go1.18 rename to pkg/docker/Dockerfile.go1.19 index 9162d8cf..d911e76f 100644 --- a/pkg/docker/Dockerfile.go1.18 +++ b/pkg/docker/Dockerfile.go1.19 @@ -1,4 +1,4 @@ -FROM golang:1.18 as BUILDER +FROM golang:1.19 as BUILDER LABEL maintainer="NGINX Docker Maintainers " @@ -40,7 +40,7 @@ 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.18 +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 diff --git a/pkg/docker/Dockerfile.jsc11 b/pkg/docker/Dockerfile.jsc11 index 69fc72ad..30a718ba 100644 --- a/pkg/docker/Dockerfile.jsc11 +++ b/pkg/docker/Dockerfile.jsc11 @@ -1,4 +1,4 @@ -FROM openjdk:11-jdk as BUILDER +FROM eclipse-temurin:11-jdk as BUILDER LABEL maintainer="NGINX Docker Maintainers " @@ -40,7 +40,7 @@ RUN set -ex \ && 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 -FROM openjdk:11-jdk +FROM eclipse-temurin:11-jdk 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 diff --git a/pkg/docker/Dockerfile.perl5.34 b/pkg/docker/Dockerfile.perl5.36 similarity index 98% rename from pkg/docker/Dockerfile.perl5.34 rename to pkg/docker/Dockerfile.perl5.36 index db87d209..56c73c51 100644 --- a/pkg/docker/Dockerfile.perl5.34 +++ b/pkg/docker/Dockerfile.perl5.36 @@ -1,4 +1,4 @@ -FROM perl:5.34 as BUILDER +FROM perl:5.36 as BUILDER LABEL maintainer="NGINX Docker Maintainers " @@ -40,7 +40,7 @@ RUN set -ex \ && 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 -FROM perl:5.34 +FROM perl:5.36 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