diff --git a/5.032.001-main,threaded-bullseye/DevelPatchPerl.patch b/5.032.001-main,threaded-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.032.001-main,threaded-bullseye/Dockerfile b/5.032.001-main,threaded-bullseye/Dockerfile index e7161092..15c1c0a4 100644 --- a/5.032.001-main,threaded-bullseye/Dockerfile +++ b/5.032.001-main,threaded-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:bullseye LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.032.001-main,threaded-buster/DevelPatchPerl.patch b/5.032.001-main,threaded-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.032.001-main,threaded-buster/Dockerfile b/5.032.001-main,threaded-buster/Dockerfile index 0f6f8926..0bd8ceab 100644 --- a/5.032.001-main,threaded-buster/Dockerfile +++ b/5.032.001-main,threaded-buster/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:buster LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.032.001-main-bullseye/DevelPatchPerl.patch b/5.032.001-main-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.032.001-main-bullseye/Dockerfile b/5.032.001-main-bullseye/Dockerfile index cb284081..dd55f28a 100644 --- a/5.032.001-main-bullseye/Dockerfile +++ b/5.032.001-main-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:bullseye LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.032.001-main-buster/DevelPatchPerl.patch b/5.032.001-main-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.032.001-main-buster/Dockerfile b/5.032.001-main-buster/Dockerfile index d44ac6d2..63546d8e 100644 --- a/5.032.001-main-buster/Dockerfile +++ b/5.032.001-main-buster/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:buster LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.032.001-slim,threaded-bullseye/DevelPatchPerl.patch b/5.032.001-slim,threaded-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.032.001-slim,threaded-bullseye/Dockerfile b/5.032.001-slim,threaded-bullseye/Dockerfile index 61188f71..3f4a84ca 100644 --- a/5.032.001-slim,threaded-bullseye/Dockerfile +++ b/5.032.001-slim,threaded-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bullseye-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.032.001-slim,threaded-buster/DevelPatchPerl.patch b/5.032.001-slim,threaded-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.032.001-slim,threaded-buster/Dockerfile b/5.032.001-slim,threaded-buster/Dockerfile index 47771e77..d28df4bc 100644 --- a/5.032.001-slim,threaded-buster/Dockerfile +++ b/5.032.001-slim,threaded-buster/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.032.001-slim-bullseye/DevelPatchPerl.patch b/5.032.001-slim-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.032.001-slim-bullseye/Dockerfile b/5.032.001-slim-bullseye/Dockerfile index c6f96247..ec887b0c 100644 --- a/5.032.001-slim-bullseye/Dockerfile +++ b/5.032.001-slim-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bullseye-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.032.001-slim-buster/DevelPatchPerl.patch b/5.032.001-slim-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.032.001-slim-buster/Dockerfile b/5.032.001-slim-buster/Dockerfile index f27660c2..20cacac7 100644 --- a/5.032.001-slim-buster/Dockerfile +++ b/5.032.001-slim-buster/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.034.001-main,threaded-bullseye/DevelPatchPerl.patch b/5.034.001-main,threaded-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.034.001-main,threaded-bullseye/Dockerfile b/5.034.001-main,threaded-bullseye/Dockerfile index 95cd5346..a98c11ec 100644 --- a/5.034.001-main,threaded-bullseye/Dockerfile +++ b/5.034.001-main,threaded-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:bullseye LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.034.001-main,threaded-buster/DevelPatchPerl.patch b/5.034.001-main,threaded-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.034.001-main,threaded-buster/Dockerfile b/5.034.001-main,threaded-buster/Dockerfile index a191c444..982c527b 100644 --- a/5.034.001-main,threaded-buster/Dockerfile +++ b/5.034.001-main,threaded-buster/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:buster LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.034.001-main-bullseye/DevelPatchPerl.patch b/5.034.001-main-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.034.001-main-bullseye/Dockerfile b/5.034.001-main-bullseye/Dockerfile index 10f1be49..879d9ec5 100644 --- a/5.034.001-main-bullseye/Dockerfile +++ b/5.034.001-main-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:bullseye LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.034.001-main-buster/DevelPatchPerl.patch b/5.034.001-main-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.034.001-main-buster/Dockerfile b/5.034.001-main-buster/Dockerfile index eeacf6af..a5640d1d 100644 --- a/5.034.001-main-buster/Dockerfile +++ b/5.034.001-main-buster/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:buster LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.034.001-slim,threaded-bullseye/DevelPatchPerl.patch b/5.034.001-slim,threaded-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.034.001-slim,threaded-bullseye/Dockerfile b/5.034.001-slim,threaded-bullseye/Dockerfile index 8c3cda4a..40f77a5f 100644 --- a/5.034.001-slim,threaded-bullseye/Dockerfile +++ b/5.034.001-slim,threaded-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bullseye-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.034.001-slim,threaded-buster/DevelPatchPerl.patch b/5.034.001-slim,threaded-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.034.001-slim,threaded-buster/Dockerfile b/5.034.001-slim,threaded-buster/Dockerfile index e23ac2bb..60aebdf6 100644 --- a/5.034.001-slim,threaded-buster/Dockerfile +++ b/5.034.001-slim,threaded-buster/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.034.001-slim-bullseye/DevelPatchPerl.patch b/5.034.001-slim-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.034.001-slim-bullseye/Dockerfile b/5.034.001-slim-bullseye/Dockerfile index c5d883ce..fd6606d2 100644 --- a/5.034.001-slim-bullseye/Dockerfile +++ b/5.034.001-slim-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bullseye-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.034.001-slim-buster/DevelPatchPerl.patch b/5.034.001-slim-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.034.001-slim-buster/Dockerfile b/5.034.001-slim-buster/Dockerfile index 4365cc23..2584747b 100644 --- a/5.034.001-slim-buster/Dockerfile +++ b/5.034.001-slim-buster/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.036.000-main,threaded-bullseye/DevelPatchPerl.patch b/5.036.000-main,threaded-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.036.000-main,threaded-bullseye/Dockerfile b/5.036.000-main,threaded-bullseye/Dockerfile index 67c17ddf..cf43b1fe 100644 --- a/5.036.000-main,threaded-bullseye/Dockerfile +++ b/5.036.000-main,threaded-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:bullseye LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.036.000-main,threaded-buster/DevelPatchPerl.patch b/5.036.000-main,threaded-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.036.000-main,threaded-buster/Dockerfile b/5.036.000-main,threaded-buster/Dockerfile index 5ba06f08..2e9dab83 100644 --- a/5.036.000-main,threaded-buster/Dockerfile +++ b/5.036.000-main,threaded-buster/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:buster LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.036.000-main-bullseye/DevelPatchPerl.patch b/5.036.000-main-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.036.000-main-bullseye/Dockerfile b/5.036.000-main-bullseye/Dockerfile index 837ae970..2230ea77 100644 --- a/5.036.000-main-bullseye/Dockerfile +++ b/5.036.000-main-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:bullseye LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.036.000-main-buster/DevelPatchPerl.patch b/5.036.000-main-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.036.000-main-buster/Dockerfile b/5.036.000-main-buster/Dockerfile index 0f93652b..582c68f4 100644 --- a/5.036.000-main-buster/Dockerfile +++ b/5.036.000-main-buster/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:buster LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN true \ diff --git a/5.036.000-slim,threaded-bullseye/DevelPatchPerl.patch b/5.036.000-slim,threaded-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.036.000-slim,threaded-bullseye/Dockerfile b/5.036.000-slim,threaded-bullseye/Dockerfile index ba56765a..8faef73a 100644 --- a/5.036.000-slim,threaded-bullseye/Dockerfile +++ b/5.036.000-slim,threaded-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bullseye-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.036.000-slim,threaded-buster/DevelPatchPerl.patch b/5.036.000-slim,threaded-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.036.000-slim,threaded-buster/Dockerfile b/5.036.000-slim,threaded-buster/Dockerfile index 4e1420c3..cc4ff73c 100644 --- a/5.036.000-slim,threaded-buster/Dockerfile +++ b/5.036.000-slim,threaded-buster/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.036.000-slim-bullseye/DevelPatchPerl.patch b/5.036.000-slim-bullseye/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.036.000-slim-bullseye/Dockerfile b/5.036.000-slim-bullseye/Dockerfile index d66901fa..3f066958 100644 --- a/5.036.000-slim-bullseye/Dockerfile +++ b/5.036.000-slim-bullseye/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bullseye-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.036.000-slim-buster/DevelPatchPerl.patch b/5.036.000-slim-buster/DevelPatchPerl.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/5.036.000-slim-buster/Dockerfile b/5.036.000-slim-buster/Dockerfile index ab1ca90a..c2599872 100644 --- a/5.036.000-slim-buster/Dockerfile +++ b/5.036.000-slim-buster/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster-slim LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +# No DevelPatchPerl.patch generated WORKDIR /usr/src/perl RUN apt-get update \ diff --git a/5.037.008-main,threaded-bullseye/Dockerfile b/5.037.008-main,threaded-bullseye/Dockerfile new file mode 100644 index 00000000..66ebbdd3 --- /dev/null +++ b/5.037.008-main,threaded-bullseye/Dockerfile @@ -0,0 +1,35 @@ +FROM buildpack-deps:bullseye +LABEL maintainer="Peter Martini , Zak B. Elep " + +# No DevelPatchPerl.patch generated +WORKDIR /usr/src/perl + +RUN true \ + && curl -fL https://www.cpan.org/src/5.0/perl-5.37.8.tar.xz -o perl-5.37.8.tar.xz \ + && echo 'eca6396a4b1aa7a38ef467ce54ed897cc84ba948fad0f90aeb210e57b04daf3c *perl-5.37.8.tar.xz' | sha256sum --strict --check - \ + && tar --strip-components=1 -xaf perl-5.37.8.tar.xz -C /usr/src/perl \ + && rm perl-5.37.8.tar.xz \ + && cat *.patch | patch -p1 \ + && 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 -Dusedevel -Dversiononly=undef -des \ + && make -j$(nproc) \ + && TEST_JOBS=$(nproc) make test_harness \ + && make install \ + && cd /usr/src \ + && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \ + && echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \ + && tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \ + && cpanm IO::Socket::SSL \ + && curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \ + # sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299 + && echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \ + && chmod +x /usr/local/bin/cpm \ + && true \ + && rm -fr /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \ + && cpanm --version && cpm --version + +WORKDIR / + +CMD ["perl5.37.8","-de0"] diff --git a/5.037.008-main,threaded-buster/Dockerfile b/5.037.008-main,threaded-buster/Dockerfile new file mode 100644 index 00000000..784ef04f --- /dev/null +++ b/5.037.008-main,threaded-buster/Dockerfile @@ -0,0 +1,35 @@ +FROM buildpack-deps:buster +LABEL maintainer="Peter Martini , Zak B. Elep " + +# No DevelPatchPerl.patch generated +WORKDIR /usr/src/perl + +RUN true \ + && curl -fL https://www.cpan.org/src/5.0/perl-5.37.8.tar.xz -o perl-5.37.8.tar.xz \ + && echo 'eca6396a4b1aa7a38ef467ce54ed897cc84ba948fad0f90aeb210e57b04daf3c *perl-5.37.8.tar.xz' | sha256sum --strict --check - \ + && tar --strip-components=1 -xaf perl-5.37.8.tar.xz -C /usr/src/perl \ + && rm perl-5.37.8.tar.xz \ + && cat *.patch | patch -p1 \ + && 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 -Dusedevel -Dversiononly=undef -des \ + && make -j$(nproc) \ + && TEST_JOBS=$(nproc) make test_harness \ + && make install \ + && cd /usr/src \ + && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \ + && echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \ + && tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \ + && cpanm IO::Socket::SSL \ + && curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \ + # sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299 + && echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \ + && chmod +x /usr/local/bin/cpm \ + && true \ + && rm -fr /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \ + && cpanm --version && cpm --version + +WORKDIR / + +CMD ["perl5.37.8","-de0"] diff --git a/5.037.008-main-bullseye/Dockerfile b/5.037.008-main-bullseye/Dockerfile new file mode 100644 index 00000000..ccfa0465 --- /dev/null +++ b/5.037.008-main-bullseye/Dockerfile @@ -0,0 +1,35 @@ +FROM buildpack-deps:bullseye +LABEL maintainer="Peter Martini , Zak B. Elep " + +# No DevelPatchPerl.patch generated +WORKDIR /usr/src/perl + +RUN true \ + && curl -fL https://www.cpan.org/src/5.0/perl-5.37.8.tar.xz -o perl-5.37.8.tar.xz \ + && echo 'eca6396a4b1aa7a38ef467ce54ed897cc84ba948fad0f90aeb210e57b04daf3c *perl-5.37.8.tar.xz' | sha256sum --strict --check - \ + && tar --strip-components=1 -xaf perl-5.37.8.tar.xz -C /usr/src/perl \ + && rm perl-5.37.8.tar.xz \ + && cat *.patch | patch -p1 \ + && 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 -Dusedevel -Dversiononly=undef -des \ + && make -j$(nproc) \ + && TEST_JOBS=$(nproc) make test_harness \ + && make install \ + && cd /usr/src \ + && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \ + && echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \ + && tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \ + && cpanm IO::Socket::SSL \ + && curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \ + # sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299 + && echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \ + && chmod +x /usr/local/bin/cpm \ + && true \ + && rm -fr /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \ + && cpanm --version && cpm --version + +WORKDIR / + +CMD ["perl5.37.8","-de0"] diff --git a/5.037.008-main-buster/Dockerfile b/5.037.008-main-buster/Dockerfile new file mode 100644 index 00000000..ff2a1e42 --- /dev/null +++ b/5.037.008-main-buster/Dockerfile @@ -0,0 +1,35 @@ +FROM buildpack-deps:buster +LABEL maintainer="Peter Martini , Zak B. Elep " + +# No DevelPatchPerl.patch generated +WORKDIR /usr/src/perl + +RUN true \ + && curl -fL https://www.cpan.org/src/5.0/perl-5.37.8.tar.xz -o perl-5.37.8.tar.xz \ + && echo 'eca6396a4b1aa7a38ef467ce54ed897cc84ba948fad0f90aeb210e57b04daf3c *perl-5.37.8.tar.xz' | sha256sum --strict --check - \ + && tar --strip-components=1 -xaf perl-5.37.8.tar.xz -C /usr/src/perl \ + && rm perl-5.37.8.tar.xz \ + && cat *.patch | patch -p1 \ + && 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 -Dusedevel -Dversiononly=undef -des \ + && make -j$(nproc) \ + && TEST_JOBS=$(nproc) make test_harness \ + && make install \ + && cd /usr/src \ + && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \ + && echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \ + && tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \ + && cpanm IO::Socket::SSL \ + && curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \ + # sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299 + && echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \ + && chmod +x /usr/local/bin/cpm \ + && true \ + && rm -fr /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \ + && cpanm --version && cpm --version + +WORKDIR / + +CMD ["perl5.37.8","-de0"] diff --git a/5.037.008-slim,threaded-bullseye/Dockerfile b/5.037.008-slim,threaded-bullseye/Dockerfile new file mode 100644 index 00000000..8bd3e35b --- /dev/null +++ b/5.037.008-slim,threaded-bullseye/Dockerfile @@ -0,0 +1,60 @@ +FROM debian:bullseye-slim +LABEL maintainer="Peter Martini , Zak B. Elep " + +# No DevelPatchPerl.patch generated +WORKDIR /usr/src/perl + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + # cpio \ + curl \ + dpkg-dev \ + # file \ + gcc \ + # g++ \ + # libbz2-dev \ + # libdb-dev \ + libc6-dev \ + # libgdbm-dev \ + # liblzma-dev \ + make \ + netbase \ + patch \ + # procps \ + zlib1g-dev \ + xz-utils \ + libssl-dev \ + && curl -fL https://www.cpan.org/src/5.0/perl-5.37.8.tar.xz -o perl-5.37.8.tar.xz \ + && echo 'eca6396a4b1aa7a38ef467ce54ed897cc84ba948fad0f90aeb210e57b04daf3c *perl-5.37.8.tar.xz' | sha256sum --strict --check - \ + && tar --strip-components=1 -xaf perl-5.37.8.tar.xz -C /usr/src/perl \ + && rm perl-5.37.8.tar.xz \ + && cat *.patch | patch -p1 \ + && 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 -Dusedevel -Dversiononly=undef -des \ + && make -j$(nproc) \ + && TEST_JOBS=$(nproc) make test_harness \ + && make install \ + && cd /usr/src \ + && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \ + && echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \ + && tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \ + && cpanm IO::Socket::SSL \ + && curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \ + # sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299 + && echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \ + && chmod +x /usr/local/bin/cpm \ + && savedPackages="ca-certificates make netbase zlib1g-dev libssl-dev" \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedPackages \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \ + && rm -fr /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \ + && cpanm --version && cpm --version + +WORKDIR / + +CMD ["perl5.37.8","-de0"] diff --git a/5.037.008-slim,threaded-buster/Dockerfile b/5.037.008-slim,threaded-buster/Dockerfile new file mode 100644 index 00000000..2c63fc36 --- /dev/null +++ b/5.037.008-slim,threaded-buster/Dockerfile @@ -0,0 +1,60 @@ +FROM debian:buster-slim +LABEL maintainer="Peter Martini , Zak B. Elep " + +# No DevelPatchPerl.patch generated +WORKDIR /usr/src/perl + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + # cpio \ + curl \ + dpkg-dev \ + # file \ + gcc \ + # g++ \ + # libbz2-dev \ + # libdb-dev \ + libc6-dev \ + # libgdbm-dev \ + # liblzma-dev \ + make \ + netbase \ + patch \ + # procps \ + zlib1g-dev \ + xz-utils \ + libssl-dev \ + && curl -fL https://www.cpan.org/src/5.0/perl-5.37.8.tar.xz -o perl-5.37.8.tar.xz \ + && echo 'eca6396a4b1aa7a38ef467ce54ed897cc84ba948fad0f90aeb210e57b04daf3c *perl-5.37.8.tar.xz' | sha256sum --strict --check - \ + && tar --strip-components=1 -xaf perl-5.37.8.tar.xz -C /usr/src/perl \ + && rm perl-5.37.8.tar.xz \ + && cat *.patch | patch -p1 \ + && 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 -Dusedevel -Dversiononly=undef -des \ + && make -j$(nproc) \ + && TEST_JOBS=$(nproc) make test_harness \ + && make install \ + && cd /usr/src \ + && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \ + && echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \ + && tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \ + && cpanm IO::Socket::SSL \ + && curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \ + # sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299 + && echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \ + && chmod +x /usr/local/bin/cpm \ + && savedPackages="ca-certificates make netbase zlib1g-dev libssl-dev" \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedPackages \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \ + && rm -fr /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \ + && cpanm --version && cpm --version + +WORKDIR / + +CMD ["perl5.37.8","-de0"] diff --git a/5.037.008-slim-bullseye/Dockerfile b/5.037.008-slim-bullseye/Dockerfile new file mode 100644 index 00000000..fd94d5c2 --- /dev/null +++ b/5.037.008-slim-bullseye/Dockerfile @@ -0,0 +1,60 @@ +FROM debian:bullseye-slim +LABEL maintainer="Peter Martini , Zak B. Elep " + +# No DevelPatchPerl.patch generated +WORKDIR /usr/src/perl + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + # cpio \ + curl \ + dpkg-dev \ + # file \ + gcc \ + # g++ \ + # libbz2-dev \ + # libdb-dev \ + libc6-dev \ + # libgdbm-dev \ + # liblzma-dev \ + make \ + netbase \ + patch \ + # procps \ + zlib1g-dev \ + xz-utils \ + libssl-dev \ + && curl -fL https://www.cpan.org/src/5.0/perl-5.37.8.tar.xz -o perl-5.37.8.tar.xz \ + && echo 'eca6396a4b1aa7a38ef467ce54ed897cc84ba948fad0f90aeb210e57b04daf3c *perl-5.37.8.tar.xz' | sha256sum --strict --check - \ + && tar --strip-components=1 -xaf perl-5.37.8.tar.xz -C /usr/src/perl \ + && rm perl-5.37.8.tar.xz \ + && cat *.patch | patch -p1 \ + && 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 -Dusedevel -Dversiononly=undef -des \ + && make -j$(nproc) \ + && TEST_JOBS=$(nproc) make test_harness \ + && make install \ + && cd /usr/src \ + && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \ + && echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \ + && tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \ + && cpanm IO::Socket::SSL \ + && curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \ + # sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299 + && echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \ + && chmod +x /usr/local/bin/cpm \ + && savedPackages="ca-certificates make netbase zlib1g-dev libssl-dev" \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedPackages \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \ + && rm -fr /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \ + && cpanm --version && cpm --version + +WORKDIR / + +CMD ["perl5.37.8","-de0"] diff --git a/5.037.008-slim-buster/Dockerfile b/5.037.008-slim-buster/Dockerfile new file mode 100644 index 00000000..a7bd741a --- /dev/null +++ b/5.037.008-slim-buster/Dockerfile @@ -0,0 +1,60 @@ +FROM debian:buster-slim +LABEL maintainer="Peter Martini , Zak B. Elep " + +# No DevelPatchPerl.patch generated +WORKDIR /usr/src/perl + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + # cpio \ + curl \ + dpkg-dev \ + # file \ + gcc \ + # g++ \ + # libbz2-dev \ + # libdb-dev \ + libc6-dev \ + # libgdbm-dev \ + # liblzma-dev \ + make \ + netbase \ + patch \ + # procps \ + zlib1g-dev \ + xz-utils \ + libssl-dev \ + && curl -fL https://www.cpan.org/src/5.0/perl-5.37.8.tar.xz -o perl-5.37.8.tar.xz \ + && echo 'eca6396a4b1aa7a38ef467ce54ed897cc84ba948fad0f90aeb210e57b04daf3c *perl-5.37.8.tar.xz' | sha256sum --strict --check - \ + && tar --strip-components=1 -xaf perl-5.37.8.tar.xz -C /usr/src/perl \ + && rm perl-5.37.8.tar.xz \ + && cat *.patch | patch -p1 \ + && 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 -Dusedevel -Dversiononly=undef -des \ + && make -j$(nproc) \ + && TEST_JOBS=$(nproc) make test_harness \ + && make install \ + && cd /usr/src \ + && curl -fLO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \ + && echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \ + && tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \ + && cpanm IO::Socket::SSL \ + && curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \ + # sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299 + && echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \ + && chmod +x /usr/local/bin/cpm \ + && savedPackages="ca-certificates make netbase zlib1g-dev libssl-dev" \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedPackages \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \ + && rm -fr /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \ + && cpanm --version && cpm --version + +WORKDIR / + +CMD ["perl5.37.8","-de0"] diff --git a/config.yml b/config.yml index b3f4fdcd..8a1acb1e 100644 --- a/config.yml +++ b/config.yml @@ -8,6 +8,14 @@ options: threaded: "-Dusethreads" releases: + - version: 5.37.8 + sha256: eca6396a4b1aa7a38ef467ce54ed897cc84ba948fad0f90aeb210e57b04daf3c + extra_flags: "-Dusedevel -Dversiononly=undef" + type: xz + debian_release: + - buster + - bullseye + - version: 5.32.1 sha256: 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 type: xz diff --git a/cpanfile b/cpanfile index 0f49f52b..205ced06 100644 --- a/cpanfile +++ b/cpanfile @@ -2,6 +2,7 @@ requires 'Devel::PatchPerl'; requires 'YAML::XS'; requires 'LWP::Simple'; requires 'LWP::Protocol::https'; +requires 'Perl::Version'; on 'develop' => sub { requires 'Perl::Tidy'; diff --git a/generate.pl b/generate.pl index 357f5518..eaa5289a 100755 --- a/generate.pl +++ b/generate.pl @@ -177,9 +177,13 @@ sub die_with_sample { mkdir $dir unless -d $dir; # Set up the generated DevelPatchPerl.patch - { + if ($patch) { open my $fh, ">", "$dir/DevelPatchPerl.patch"; print $fh $patch; + $output =~ s!\{\{docker_copy_perl_patch\}\}!COPY *.patch /usr/src/perl/!mg; + } + else { + $output =~ s!\{\{docker_copy_perl_patch\}\}!# No DevelPatchPerl.patch generated!mg; } $release->{run_tests} //= "parallel"; @@ -285,7 +289,7 @@ =head1 DESCRIPTION FROM {{image}}:{{tag}} LABEL maintainer="Peter Martini , Zak B. Elep " -COPY *.patch /usr/src/perl/ +{{docker_copy_perl_patch}} WORKDIR /usr/src/perl RUN {{docker_slim_run_install}} \ diff --git a/library.pl b/library.pl index e16ca209..fb3f18c7 100755 --- a/library.pl +++ b/library.pl @@ -2,6 +2,7 @@ use 5.014; use strict; use warnings; +use Perl::Version; use YAML::XS; my %arches = ( @@ -21,7 +22,7 @@ sub suffix { my $suffix = shift; - map { $_ eq 'latest' ? $suffix : $_ . '-' . $suffix } @_; + map { $_ =~ /(latest|devel)/ ? $suffix : $_ . '-' . $suffix } @_; } sub entry { @@ -37,8 +38,13 @@ sub entry { push @versionAliases, join '.', @version[0 .. $i]; } - push @versionAliases, 'latest'; - + if (Perl::Version->new($version)->version % 2) { + push @versionAliases, 'latest-blead', 'devel' + } + else { + push @versionAliases, 'latest'; + } + (my $buildSuffix = $build) =~ s/^main,//; $buildSuffix =~ s/,/-/g; my @buildAliases = ($build eq 'main' ? @versionAliases : suffix $buildSuffix, @versionAliases);