From 2fc64c65bcd4bc0d6a46a0e19731fd5038bd1853 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 21 Sep 2021 14:03:54 +0300 Subject: [PATCH] Regenerated Dockerfiles. --- pkg/docker/{Dockerfile.go1.15 => Dockerfile.go1.17} | 4 ++-- pkg/docker/Dockerfile.minimal | 4 ++-- pkg/docker/{Dockerfile.node15 => Dockerfile.node16} | 4 ++-- pkg/docker/{Dockerfile.perl5.32 => Dockerfile.perl5.34} | 4 ++-- pkg/docker/{Dockerfile.ruby2.7 => Dockerfile.ruby3.0} | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename pkg/docker/{Dockerfile.go1.15 => Dockerfile.go1.17} (98%) rename pkg/docker/{Dockerfile.node15 => Dockerfile.node16} (98%) rename pkg/docker/{Dockerfile.perl5.32 => Dockerfile.perl5.34} (98%) rename pkg/docker/{Dockerfile.ruby2.7 => Dockerfile.ruby3.0} (98%) diff --git a/pkg/docker/Dockerfile.go1.15 b/pkg/docker/Dockerfile.go1.17 similarity index 98% rename from pkg/docker/Dockerfile.go1.15 rename to pkg/docker/Dockerfile.go1.17 index 0c88ff64..189f5baf 100644 --- a/pkg/docker/Dockerfile.go1.15 +++ b/pkg/docker/Dockerfile.go1.17 @@ -1,4 +1,4 @@ -FROM golang:1.15 as BUILDER +FROM golang:1.17 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.15 +FROM golang:1.17 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.minimal b/pkg/docker/Dockerfile.minimal index 00875732..01762c13 100644 --- a/pkg/docker/Dockerfile.minimal +++ b/pkg/docker/Dockerfile.minimal @@ -1,4 +1,4 @@ -FROM debian:buster-slim as BUILDER +FROM debian:bullseye-slim as BUILDER LABEL maintainer="NGINX Docker Maintainers " @@ -40,7 +40,7 @@ RUN set -ex \ && make -j $NCPU version \ && 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 debian:buster-slim +FROM debian:bullseye-slim 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.node15 b/pkg/docker/Dockerfile.node16 similarity index 98% rename from pkg/docker/Dockerfile.node15 rename to pkg/docker/Dockerfile.node16 index f98d0ef3..a97e5861 100644 --- a/pkg/docker/Dockerfile.node15 +++ b/pkg/docker/Dockerfile.node16 @@ -1,4 +1,4 @@ -FROM node:15 as BUILDER +FROM node:16 as BUILDER LABEL maintainer="NGINX Docker Maintainers " @@ -40,7 +40,7 @@ RUN set -ex \ && make -j $NCPU node node-install 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 node:15 +FROM node:16 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.32 b/pkg/docker/Dockerfile.perl5.34 similarity index 98% rename from pkg/docker/Dockerfile.perl5.32 rename to pkg/docker/Dockerfile.perl5.34 index 244eb076..b703f842 100644 --- a/pkg/docker/Dockerfile.perl5.32 +++ b/pkg/docker/Dockerfile.perl5.34 @@ -1,4 +1,4 @@ -FROM perl:5.32 as BUILDER +FROM perl:5.34 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.32 +FROM perl:5.34 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.ruby2.7 b/pkg/docker/Dockerfile.ruby3.0 similarity index 98% rename from pkg/docker/Dockerfile.ruby2.7 rename to pkg/docker/Dockerfile.ruby3.0 index d5140288..f4b4b054 100644 --- a/pkg/docker/Dockerfile.ruby2.7 +++ b/pkg/docker/Dockerfile.ruby3.0 @@ -1,4 +1,4 @@ -FROM ruby:2.7 as BUILDER +FROM ruby:3.0 as BUILDER LABEL maintainer="NGINX Docker Maintainers " @@ -40,7 +40,7 @@ RUN set -ex \ && make -j $NCPU ruby-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 ruby:2.7 +FROM ruby:3.0 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