From 37962fd31377c47af76ce52532f10f9165163fd8 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Sat, 9 Apr 2016 21:50:55 +0800 Subject: [PATCH 01/10] Try out building with alpine image Adapted from @ncopa's example in Perl/docker-perl#23 . --- alpine/DevelPatchPerl.patch | 12 ++++++++++++ alpine/Dockerfile | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 alpine/DevelPatchPerl.patch create mode 100644 alpine/Dockerfile diff --git a/alpine/DevelPatchPerl.patch b/alpine/DevelPatchPerl.patch new file mode 100644 index 00000000..05177e49 --- /dev/null +++ b/alpine/DevelPatchPerl.patch @@ -0,0 +1,12 @@ +diff --git a/patchlevel.h b/patchlevel.h +index bd56612..3d5f668 100644 +--- a/patchlevel.h ++++ b/patchlevel.h +@@ -137,6 +137,7 @@ static const char * const local_patches[] = { + ,"uncommitted-changes" + #endif + PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */ ++ ,"Devel::PatchPerl 1.38" + ,NULL + }; + diff --git a/alpine/Dockerfile b/alpine/Dockerfile new file mode 100644 index 00000000..f9db690e --- /dev/null +++ b/alpine/Dockerfile @@ -0,0 +1,33 @@ +FROM alpine:latest +MAINTAINER Peter Martini + +RUN mkdir -p /usr/src/perl +COPY *.patch /usr/src/perl/ +WORKDIR /usr/src/perl + +ENV PERL_CPANM_OPT --no-wget + +RUN set -x \ + && NPROC=$(getconf _NPROCESSORS_ONLN) \ + && apk add --no-cache curl procps tar build-base \ + && curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2 -o perl-5.22.1.tar.bz2 \ + && echo '29f9b320b0299577a3e1d02e9e8ef8f26f160332 *perl-5.22.1.tar.bz2' | sha1sum -c - \ + && tar --strip-components=1 -xjf perl-5.22.1.tar.bz2 -C /usr/src/perl \ + && rm perl-5.22.1.tar.bz2 \ + && cat *.patch | patch -p1 \ + && ./Configure -Duse64bitall -Duseshrplib -des \ + && sed -i -e "s,\(d_setlocale=\)'define',\1'undef',g" ./config.sh \ + && ./Configure -S \ + && install -m0644 ./config.sh ./xconfig.sh \ + && make -j$NPROC \ + && TEST_JOBS=$NPROC make test_harness \ + && make install \ + && cd /usr/src \ + && curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \ + && chmod +x cpanm \ + && ./cpanm App::cpanminus \ + && rm -fr ./cpanm /root/.cpanm /usr/src/perl /tmp/* + +WORKDIR /root + +CMD ["perl5.22.1","-de0"] From e90bf09e662a72e23effedb1df1e9dde3b3ef001 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Fri, 22 Apr 2016 12:04:27 +0800 Subject: [PATCH 02/10] Remove build deps (but retain make) `cpanm` can make use of `make` when installing pure-Perl stuff. --- alpine/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index f9db690e..54165136 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -9,7 +9,8 @@ ENV PERL_CPANM_OPT --no-wget RUN set -x \ && NPROC=$(getconf _NPROCESSORS_ONLN) \ - && apk add --no-cache curl procps tar build-base \ + && apk add --no-cache make \ + && apk add --no-cache --virtual .build-deps curl procps tar build-base \ && curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2 -o perl-5.22.1.tar.bz2 \ && echo '29f9b320b0299577a3e1d02e9e8ef8f26f160332 *perl-5.22.1.tar.bz2' | sha1sum -c - \ && tar --strip-components=1 -xjf perl-5.22.1.tar.bz2 -C /usr/src/perl \ @@ -26,6 +27,7 @@ RUN set -x \ && curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \ && chmod +x cpanm \ && ./cpanm App::cpanminus \ + && apk del .build-deps \ && rm -fr ./cpanm /root/.cpanm /usr/src/perl /tmp/* WORKDIR /root From f7d53702a4f19d9e88778a5e5824a50c1f0aed78 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 22 Apr 2016 17:28:04 +0200 Subject: [PATCH 03/10] Fix build dependency for alpine variant By installing `make` together with build deps we avoid downloading the apkindex more than once. We make it stay by adding it as a runtime dep before deleting build deps. --- alpine/Dockerfile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 54165136..5bc1cf06 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -9,8 +9,7 @@ ENV PERL_CPANM_OPT --no-wget RUN set -x \ && NPROC=$(getconf _NPROCESSORS_ONLN) \ - && apk add --no-cache make \ - && apk add --no-cache --virtual .build-deps curl procps tar build-base \ + && apk add --no-cache --virtual .build-deps curl procps tar build-base make \ && curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2 -o perl-5.22.1.tar.bz2 \ && echo '29f9b320b0299577a3e1d02e9e8ef8f26f160332 *perl-5.22.1.tar.bz2' | sha1sum -c - \ && tar --strip-components=1 -xjf perl-5.22.1.tar.bz2 -C /usr/src/perl \ @@ -27,6 +26,14 @@ RUN set -x \ && curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \ && chmod +x cpanm \ && ./cpanm App::cpanminus \ + && runDeps="$( \ + scanelf --needed --nobanner --recursive /usr/local \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --virtual .perl-rundeps $runDeps make \ && apk del .build-deps \ && rm -fr ./cpanm /root/.cpanm /usr/src/perl /tmp/* From 1490fecbb3c05921cd1805182ae000d9b0e52694 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Tue, 8 Sep 2020 18:28:43 +0800 Subject: [PATCH 04/10] alpine/Dockerfile: Update for Perl 5.32 + review fixes Apply review changes and make this closer to what we have in the mainline Dockerfiles, thanks to @tianon! Update this to build Perl 5.32 now; it seems to build and test fine without any modification! --- alpine/DevelPatchPerl.patch | 12 ------------ alpine/Dockerfile | 33 +++++++++++++-------------------- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/alpine/DevelPatchPerl.patch b/alpine/DevelPatchPerl.patch index 05177e49..e69de29b 100644 --- a/alpine/DevelPatchPerl.patch +++ b/alpine/DevelPatchPerl.patch @@ -1,12 +0,0 @@ -diff --git a/patchlevel.h b/patchlevel.h -index bd56612..3d5f668 100644 ---- a/patchlevel.h -+++ b/patchlevel.h -@@ -137,6 +137,7 @@ static const char * const local_patches[] = { - ,"uncommitted-changes" - #endif - PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */ -+ ,"Devel::PatchPerl 1.38" - ,NULL - }; - diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 5bc1cf06..24527284 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,31 +1,24 @@ -FROM alpine:latest -MAINTAINER Peter Martini +FROM alpine:3.12 +LABEL maintainer="Peter Martini , Zak B. Elep " -RUN mkdir -p /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl -ENV PERL_CPANM_OPT --no-wget - RUN set -x \ - && NPROC=$(getconf _NPROCESSORS_ONLN) \ - && apk add --no-cache --virtual .build-deps curl procps tar build-base make \ - && curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.22.1.tar.bz2 -o perl-5.22.1.tar.bz2 \ - && echo '29f9b320b0299577a3e1d02e9e8ef8f26f160332 *perl-5.22.1.tar.bz2' | sha1sum -c - \ - && tar --strip-components=1 -xjf perl-5.22.1.tar.bz2 -C /usr/src/perl \ - && rm perl-5.22.1.tar.bz2 \ + && apk add --no-cache --virtual .build-deps curl procps tar build-base make xz \ + && curl -SL https://www.cpan.org/src/5.0/perl-5.32.0.tar.xz -o perl-5.32.0.tar.xz \ + && echo '6f436b447cf56d22464f980fac1916e707a040e96d52172984c5d184c09b859b *perl-5.32.0.tar.xz' | sha256sum -c - \ + && tar --strip-components=1 -xaf perl-5.32.0.tar.xz -C /usr/src/perl \ + && rm perl-5.32.0.tar.xz \ && cat *.patch | patch -p1 \ && ./Configure -Duse64bitall -Duseshrplib -des \ - && sed -i -e "s,\(d_setlocale=\)'define',\1'undef',g" ./config.sh \ - && ./Configure -S \ - && install -m0644 ./config.sh ./xconfig.sh \ - && make -j$NPROC \ - && TEST_JOBS=$NPROC make test_harness \ + && make -j$(nproc) \ + && TEST_JOBS=$(nproc) make test_harness \ && make install \ && cd /usr/src \ - && curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \ - && chmod +x cpanm \ - && ./cpanm App::cpanminus \ + && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \ + && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \ + && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \ && runDeps="$( \ scanelf --needed --nobanner --recursive /usr/local \ | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ @@ -35,7 +28,7 @@ RUN set -x \ )" \ && apk add --virtual .perl-rundeps $runDeps make \ && apk del .build-deps \ - && rm -fr ./cpanm /root/.cpanm /usr/src/perl /tmp/* + && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/* WORKDIR /root From 26d57bb7968e180bd081a89478daa0929c7cd80c Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Tue, 8 Sep 2020 18:32:23 +0800 Subject: [PATCH 05/10] :gear: Add alpine,threaded variant --- alpine,threaded/DevelPatchPerl.patch | 0 alpine,threaded/Dockerfile | 35 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 alpine,threaded/DevelPatchPerl.patch create mode 100644 alpine,threaded/Dockerfile diff --git a/alpine,threaded/DevelPatchPerl.patch b/alpine,threaded/DevelPatchPerl.patch new file mode 100644 index 00000000..e69de29b diff --git a/alpine,threaded/Dockerfile b/alpine,threaded/Dockerfile new file mode 100644 index 00000000..1434827c --- /dev/null +++ b/alpine,threaded/Dockerfile @@ -0,0 +1,35 @@ +FROM alpine:3.12 +LABEL maintainer="Peter Martini , Zak B. Elep " + +COPY *.patch /usr/src/perl/ +WORKDIR /usr/src/perl + +RUN set -x \ + && apk add --no-cache --virtual .build-deps curl procps tar build-base make xz \ + && curl -SL https://www.cpan.org/src/5.0/perl-5.32.0.tar.xz -o perl-5.32.0.tar.xz \ + && echo '6f436b447cf56d22464f980fac1916e707a040e96d52172984c5d184c09b859b *perl-5.32.0.tar.xz' | sha256sum -c - \ + && tar --strip-components=1 -xaf perl-5.32.0.tar.xz -C /usr/src/perl \ + && rm perl-5.32.0.tar.xz \ + && cat *.patch | patch -p1 \ + && ./Configure -Duse64bitall -Dusethreads -Duseshrplib -des \ + && make -j$(nproc) \ + && TEST_JOBS=$(nproc) make test_harness \ + && make install \ + && cd /usr/src \ + && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \ + && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \ + && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \ + && runDeps="$( \ + scanelf --needed --nobanner --recursive /usr/local \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --virtual .perl-rundeps $runDeps make \ + && apk del .build-deps \ + && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/* + +WORKDIR /root + +CMD ["perl5.22.1","-de0"] From 7e5349019178f9842f9a3ee986bf7829cda5d187 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Tue, 8 Sep 2020 19:44:58 +0800 Subject: [PATCH 06/10] :gear: Add workflow for alpine variants --- .github/workflows/build-alpine.yml | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/build-alpine.yml diff --git a/.github/workflows/build-alpine.yml b/.github/workflows/build-alpine.yml new file mode 100644 index 00000000..d8e65500 --- /dev/null +++ b/.github/workflows/build-alpine.yml @@ -0,0 +1,33 @@ +name: Build and test Perl 5.32 on alpine + +on: + push: + branches: + - '**' + tags-ignore: + - '*' + pull_request: + +jobs: + build-alpine: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Clone docker-library/official-images (for testing) + run: | + git clone --depth 1 --single-branch https://github.com/docker-library/official-images.git + - name: Build image + run: | + docker version + docker build --no-cache -t perl:5.32-alpine alpine + docker build --no-cache -t perl:5.32-alpine-threaded alpine,threaded + - name: Inspect image creation and tag time + run: | + docker image inspect --format \'{{.Created}}\' perl:5.32-alpine + docker image inspect --format \'{{.Metadata.LastTagTime}}\' perl:5.32-alpine + docker image inspect --format \'{{.Created}}\' perl:5.32-alpine-threaded + docker image inspect --format \'{{.Metadata.LastTagTime}}\' perl:5.32-alpine-threaded + - name: Run tests + run: | + ./official-images/test/run.sh perl:5.32-alpine + ./official-images/test/run.sh perl:5.32-alpine-threaded From 1a0a75a8a32cdc9e1dfc0579705882ed3092c903 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 9 Sep 2020 14:31:57 +0800 Subject: [PATCH 07/10] Add wget to alpine rundeps We previously had `PERL_CPANM_OPT=--no-wget`, but since that can be a user-set variable in child images, let's just install the real wget instead (especially since the busybox builtin isn't as feature-rich.) --- alpine,threaded/Dockerfile | 2 +- alpine/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine,threaded/Dockerfile b/alpine,threaded/Dockerfile index 1434827c..328d26d4 100644 --- a/alpine,threaded/Dockerfile +++ b/alpine,threaded/Dockerfile @@ -26,7 +26,7 @@ RUN set -x \ | xargs -r apk info --installed \ | sort -u \ )" \ - && apk add --virtual .perl-rundeps $runDeps make \ + && apk add --virtual .perl-rundeps $runDeps make wget \ && apk del .build-deps \ && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/* diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 24527284..82a3aab9 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -26,7 +26,7 @@ RUN set -x \ | xargs -r apk info --installed \ | sort -u \ )" \ - && apk add --virtual .perl-rundeps $runDeps make \ + && apk add --virtual .perl-rundeps $runDeps make wget \ && apk del .build-deps \ && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/* From 4304b46abccb0caa4dec5aac08b27ed9fa618475 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 9 Sep 2020 15:19:27 +0800 Subject: [PATCH 08/10] :gear: Fix alpine CMD --- alpine,threaded/Dockerfile | 2 +- alpine/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine,threaded/Dockerfile b/alpine,threaded/Dockerfile index 328d26d4..d6960286 100644 --- a/alpine,threaded/Dockerfile +++ b/alpine,threaded/Dockerfile @@ -32,4 +32,4 @@ RUN set -x \ WORKDIR /root -CMD ["perl5.22.1","-de0"] +CMD ["perl5.32.0","-de0"] diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 82a3aab9..66056315 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -32,4 +32,4 @@ RUN set -x \ WORKDIR /root -CMD ["perl5.22.1","-de0"] +CMD ["perl5.32.0","-de0"] From cdd68442e4b2554a9967db659e3d92f5148ea89e Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 10 Sep 2020 20:25:25 +0800 Subject: [PATCH 09/10] Add archFlag and archBits for alpine Ref #43, thanks @tianon for reminding! --- alpine,threaded/Dockerfile | 7 +++++-- alpine/Dockerfile | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/alpine,threaded/Dockerfile b/alpine,threaded/Dockerfile index d6960286..1ec71c04 100644 --- a/alpine,threaded/Dockerfile +++ b/alpine,threaded/Dockerfile @@ -5,13 +5,16 @@ COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl RUN set -x \ - && apk add --no-cache --virtual .build-deps curl procps tar build-base make xz \ + && apk add --no-cache --virtual .build-deps curl dpkg dpkg-dev procps tar build-base make xz \ && curl -SL https://www.cpan.org/src/5.0/perl-5.32.0.tar.xz -o perl-5.32.0.tar.xz \ && echo '6f436b447cf56d22464f980fac1916e707a040e96d52172984c5d184c09b859b *perl-5.32.0.tar.xz' | sha256sum -c - \ && tar --strip-components=1 -xaf perl-5.32.0.tar.xz -C /usr/src/perl \ && rm perl-5.32.0.tar.xz \ && cat *.patch | patch -p1 \ - && ./Configure -Duse64bitall -Dusethreads -Duseshrplib -des \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \ + && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \ + && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -des \ && make -j$(nproc) \ && TEST_JOBS=$(nproc) make test_harness \ && make install \ diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 66056315..efde16b8 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -5,13 +5,16 @@ COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl RUN set -x \ - && apk add --no-cache --virtual .build-deps curl procps tar build-base make xz \ + && apk add --no-cache --virtual .build-deps curl dpkg dpkg-dev procps tar build-base make xz \ && curl -SL https://www.cpan.org/src/5.0/perl-5.32.0.tar.xz -o perl-5.32.0.tar.xz \ && echo '6f436b447cf56d22464f980fac1916e707a040e96d52172984c5d184c09b859b *perl-5.32.0.tar.xz' | sha256sum -c - \ && tar --strip-components=1 -xaf perl-5.32.0.tar.xz -C /usr/src/perl \ && rm perl-5.32.0.tar.xz \ && cat *.patch | patch -p1 \ - && ./Configure -Duse64bitall -Duseshrplib -des \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \ + && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \ + && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -des \ && make -j$(nproc) \ && TEST_JOBS=$(nproc) make test_harness \ && make install \ From ace194f4c5efde63bdd6b5e720d7b34d2d2924a6 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Fri, 11 Sep 2020 10:29:22 +0800 Subject: [PATCH 10/10] Filter out perl package in alpine builds, move to versioned dirs The previous commit that pulls in dpkg also pulls the perl packaged for alpine, which adds some 40MB to the resulting image, so ensure we filter that out when generating the runtime deps. --- .github/workflows/build-alpine.yml | 4 ++-- .../DevelPatchPerl.patch | 0 {alpine,threaded => 5.032.000-alpine,threaded}/Dockerfile | 1 + {alpine => 5.032.000-alpine}/DevelPatchPerl.patch | 0 {alpine => 5.032.000-alpine}/Dockerfile | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) rename {alpine,threaded => 5.032.000-alpine,threaded}/DevelPatchPerl.patch (100%) rename {alpine,threaded => 5.032.000-alpine,threaded}/Dockerfile (98%) rename {alpine => 5.032.000-alpine}/DevelPatchPerl.patch (100%) rename {alpine => 5.032.000-alpine}/Dockerfile (98%) diff --git a/.github/workflows/build-alpine.yml b/.github/workflows/build-alpine.yml index d8e65500..223dd239 100644 --- a/.github/workflows/build-alpine.yml +++ b/.github/workflows/build-alpine.yml @@ -19,8 +19,8 @@ jobs: - name: Build image run: | docker version - docker build --no-cache -t perl:5.32-alpine alpine - docker build --no-cache -t perl:5.32-alpine-threaded alpine,threaded + docker build --no-cache -t perl:5.32-alpine 5.032.000-alpine + docker build --no-cache -t perl:5.32-alpine-threaded 5.032.000-alpine,threaded - name: Inspect image creation and tag time run: | docker image inspect --format \'{{.Created}}\' perl:5.32-alpine diff --git a/alpine,threaded/DevelPatchPerl.patch b/5.032.000-alpine,threaded/DevelPatchPerl.patch similarity index 100% rename from alpine,threaded/DevelPatchPerl.patch rename to 5.032.000-alpine,threaded/DevelPatchPerl.patch diff --git a/alpine,threaded/Dockerfile b/5.032.000-alpine,threaded/Dockerfile similarity index 98% rename from alpine,threaded/Dockerfile rename to 5.032.000-alpine,threaded/Dockerfile index 1ec71c04..0dfc3927 100644 --- a/alpine,threaded/Dockerfile +++ b/5.032.000-alpine,threaded/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ | sort -u \ | xargs -r apk info --installed \ | sort -u \ + | grep -v perl \ )" \ && apk add --virtual .perl-rundeps $runDeps make wget \ && apk del .build-deps \ diff --git a/alpine/DevelPatchPerl.patch b/5.032.000-alpine/DevelPatchPerl.patch similarity index 100% rename from alpine/DevelPatchPerl.patch rename to 5.032.000-alpine/DevelPatchPerl.patch diff --git a/alpine/Dockerfile b/5.032.000-alpine/Dockerfile similarity index 98% rename from alpine/Dockerfile rename to 5.032.000-alpine/Dockerfile index efde16b8..160e57a6 100644 --- a/alpine/Dockerfile +++ b/5.032.000-alpine/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ | sort -u \ | xargs -r apk info --installed \ | sort -u \ + | grep -v perl \ )" \ && apk add --virtual .perl-rundeps $runDeps make wget \ && apk del .build-deps \