From c3af21e970ca3c822004cfda7c5b56ec07d99da9 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Thu, 15 Feb 2024 21:43:58 -0800 Subject: Docker: Switch to github --- pkg/docker/Dockerfile.python3.11 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/docker/Dockerfile.python3.11') diff --git a/pkg/docker/Dockerfile.python3.11 b/pkg/docker/Dockerfile.python3.11 index b5e81b6c..b298b873 100644 --- a/pkg/docker/Dockerfile.python3.11 +++ b/pkg/docker/Dockerfile.python3.11 @@ -11,11 +11,11 @@ LABEL org.opencontainers.image.version="1.31.1" 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 curl pkg-config \ + && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates git build-essential libssl-dev libpcre2-dev curl pkg-config \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ && mkdir -p /usr/src/unit \ && cd /usr/src/unit \ - && hg clone -u 1.31.1-1 https://hg.nginx.org/unit \ + && git clone -b 1.31.1-1 https://github.com/nginx/unit \ && cd unit \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \ && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \ -- cgit From bd0abdf0838f3dd8952825332fb7631d85f51a34 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Mon, 19 Feb 2024 12:59:22 +0000 Subject: Docker: Shallow clone the Unit repo Saves on the order of 10 MBs of transfer for each build. We call `rm -rf /usr/src/unit` later in this step, so the full repo has never appeared in our published images anyway. --- pkg/docker/Dockerfile.python3.11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/docker/Dockerfile.python3.11') diff --git a/pkg/docker/Dockerfile.python3.11 b/pkg/docker/Dockerfile.python3.11 index b298b873..1d0322cc 100644 --- a/pkg/docker/Dockerfile.python3.11 +++ b/pkg/docker/Dockerfile.python3.11 @@ -15,7 +15,7 @@ RUN set -ex \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ && mkdir -p /usr/src/unit \ && cd /usr/src/unit \ - && git clone -b 1.31.1-1 https://github.com/nginx/unit \ + && git clone --depth 1 -b 1.31.1-1 https://github.com/nginx/unit \ && cd unit \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \ && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \ -- cgit From d52a9361a85ed7694815df5b707649dd6b31ead1 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Tue, 20 Feb 2024 12:56:15 +0000 Subject: Docker: Update versions of Go, Node, PHP, Ruby - Go: Drop 1.20, Add 1.22 - Node: Drop 18, Add 21 - PHP: Add 8.3 - Ruby: Add 3.3 Perl and Python are still up-to-date with upstream releases Regenerating the Dockerfiles also picks up the logging change from 183a1e9d634ae2fb129ce98f1ca8a16cbfdeac99 --- pkg/docker/Dockerfile.python3.11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/docker/Dockerfile.python3.11') diff --git a/pkg/docker/Dockerfile.python3.11 b/pkg/docker/Dockerfile.python3.11 index 1d0322cc..5fbeb1d7 100644 --- a/pkg/docker/Dockerfile.python3.11 +++ b/pkg/docker/Dockerfile.python3.11 @@ -77,7 +77,7 @@ RUN set -ex \ && apt-get purge -y --auto-remove build-essential \ && rm -rf /var/lib/apt/lists/* \ && rm -f /requirements.apt \ - && ln -sf /dev/stdout /var/log/unit.log + && ln -sf /dev/stderr /var/log/unit.log COPY docker-entrypoint.sh /usr/local/bin/ COPY welcome.* /usr/share/unit/welcome/ -- cgit From ace553dca47da60a14e10c29de0c59ec73cc3ad7 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Thu, 15 Feb 2024 19:56:06 +0000 Subject: Generated Dockerfiles for Unit 1.32.0 --- pkg/docker/Dockerfile.python3.11 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/docker/Dockerfile.python3.11') diff --git a/pkg/docker/Dockerfile.python3.11 b/pkg/docker/Dockerfile.python3.11 index 5fbeb1d7..699fa426 100644 --- a/pkg/docker/Dockerfile.python3.11 +++ b/pkg/docker/Dockerfile.python3.11 @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org" LABEL org.opencontainers.image.source="https://github.com/nginx/unit" LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images" LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers " -LABEL org.opencontainers.image.version="1.31.1" +LABEL org.opencontainers.image.version="1.32.0" RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ @@ -15,7 +15,7 @@ RUN set -ex \ && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \ && mkdir -p /usr/src/unit \ && cd /usr/src/unit \ - && git clone --depth 1 -b 1.31.1-1 https://github.com/nginx/unit \ + && git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \ && cd unit \ && NCPU="$(getconf _NPROCESSORS_ONLN)" \ && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \ -- cgit