Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

library/perl: Add slim image variants #4715

Merged
merged 1 commit into from
Aug 13, 2018

Conversation

zakame
Copy link
Contributor

@zakame zakame commented Aug 12, 2018

Provide Perl images built against "debian:slim" variants for a big reduction in image size (from 800MB down to ~100MB in most cases,) with no loss to language functionality.

Provide Perl images built against "debian:slim" variants for a big
reduction in image size (from 800MB down to ~100MB in most cases,) with
no loss to language functionality.

- Perl/docker-perl#52
- Perl/docker-perl#54
@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index c100e54..d55954e 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -4,6 +4,18 @@ perl:5.24.4 @ arm64v8
 perl:5.24.4 @ i386
 perl:5.24.4 @ ppc64le
 perl:5.24.4 @ s390x
+perl:5.24.4-slim @ amd64
+perl:5.24.4-slim @ arm32v7
+perl:5.24.4-slim @ arm64v8
+perl:5.24.4-slim @ i386
+perl:5.24.4-slim @ ppc64le
+perl:5.24.4-slim @ s390x
+perl:5.24.4-slim-threaded @ amd64
+perl:5.24.4-slim-threaded @ arm32v7
+perl:5.24.4-slim-threaded @ arm64v8
+perl:5.24.4-slim-threaded @ i386
+perl:5.24.4-slim-threaded @ ppc64le
+perl:5.24.4-slim-threaded @ s390x
 perl:5.24.4-threaded @ amd64
 perl:5.24.4-threaded @ arm32v7
 perl:5.24.4-threaded @ arm64v8
@@ -16,6 +28,18 @@ perl:5.26.2 @ arm64v8
 perl:5.26.2 @ i386
 perl:5.26.2 @ ppc64le
 perl:5.26.2 @ s390x
+perl:5.26.2-slim @ amd64
+perl:5.26.2-slim @ arm32v7
+perl:5.26.2-slim @ arm64v8
+perl:5.26.2-slim @ i386
+perl:5.26.2-slim @ ppc64le
+perl:5.26.2-slim @ s390x
+perl:5.26.2-slim-threaded @ amd64
+perl:5.26.2-slim-threaded @ arm32v7
+perl:5.26.2-slim-threaded @ arm64v8
+perl:5.26.2-slim-threaded @ i386
+perl:5.26.2-slim-threaded @ ppc64le
+perl:5.26.2-slim-threaded @ s390x
 perl:5.26.2-threaded @ amd64
 perl:5.26.2-threaded @ arm32v7
 perl:5.26.2-threaded @ arm64v8
@@ -28,6 +52,18 @@ perl:5.28.0 @ arm64v8
 perl:5.28.0 @ i386
 perl:5.28.0 @ ppc64le
 perl:5.28.0 @ s390x
+perl:5.28.0-slim @ amd64
+perl:5.28.0-slim @ arm32v7
+perl:5.28.0-slim @ arm64v8
+perl:5.28.0-slim @ i386
+perl:5.28.0-slim @ ppc64le
+perl:5.28.0-slim @ s390x
+perl:5.28.0-slim-threaded @ amd64
+perl:5.28.0-slim-threaded @ arm32v7
+perl:5.28.0-slim-threaded @ arm64v8
+perl:5.28.0-slim-threaded @ i386
+perl:5.28.0-slim-threaded @ ppc64le
+perl:5.28.0-slim-threaded @ s390x
 perl:5.28.0-threaded @ amd64
 perl:5.28.0-threaded @ arm32v7
 perl:5.28.0-threaded @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 8844f7d..2621222 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,32 @@
 perl:5
+perl:5-slim
+perl:5-slim-threaded
 perl:5-threaded
 perl:5.24
+perl:5.24-slim
+perl:5.24-slim-threaded
 perl:5.24-threaded
 perl:5.24.4
+perl:5.24.4-slim
+perl:5.24.4-slim-threaded
 perl:5.24.4-threaded
 perl:5.26
+perl:5.26-slim
+perl:5.26-slim-threaded
 perl:5.26-threaded
 perl:5.26.2
+perl:5.26.2-slim
+perl:5.26.2-slim-threaded
 perl:5.26.2-threaded
 perl:5.28
+perl:5.28-slim
+perl:5.28-slim-threaded
 perl:5.28-threaded
 perl:5.28.0
+perl:5.28.0-slim
+perl:5.28.0-slim-threaded
 perl:5.28.0-threaded
 perl:latest
+perl:slim
+perl:slim-threaded
 perl:threaded
diff --git a/perl_5.24.4-threaded/DevelPatchPerl.patch b/perl_5.24.4-slim-threaded/DevelPatchPerl.patch
similarity index 100%
copy from perl_5.24.4-threaded/DevelPatchPerl.patch
copy to perl_5.24.4-slim-threaded/DevelPatchPerl.patch
diff --git a/perl_5.24.4-threaded/Dockerfile b/perl_5.24.4-slim-threaded/Dockerfile
similarity index 62%
copy from perl_5.24.4-threaded/Dockerfile
copy to perl_5.24.4-slim-threaded/Dockerfile
index 604d4a1..ff26b5b 100644
--- a/perl_5.24.4-threaded/Dockerfile
+++ b/perl_5.24.4-slim-threaded/Dockerfile
@@ -1,10 +1,31 @@
-FROM buildpack-deps:stretch
+FROM debian:stretch-slim
 LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <[email protected]>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar.bz2 \
+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 \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar.bz2 \
     && echo 'e34ff38c54857f431f37403b757267c9998152bf46b5c750b462f62461279b10 *perl-5.24.4.tar.bz2' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.24.4.tar.bz2 -C /usr/src/perl \
     && rm perl-5.24.4.tar.bz2 \
@@ -20,6 +41,11 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar
     && curl -LO http://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 \
+    && savedPackages="make netbase" \
+    && 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 ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root
diff --git a/perl_5.24.4-threaded/DevelPatchPerl.patch b/perl_5.24.4-slim/DevelPatchPerl.patch
similarity index 100%
copy from perl_5.24.4-threaded/DevelPatchPerl.patch
copy to perl_5.24.4-slim/DevelPatchPerl.patch
diff --git a/perl_5.24.4/Dockerfile b/perl_5.24.4-slim/Dockerfile
similarity index 62%
copy from perl_5.24.4/Dockerfile
copy to perl_5.24.4-slim/Dockerfile
index 70137f8..9893afa 100644
--- a/perl_5.24.4/Dockerfile
+++ b/perl_5.24.4-slim/Dockerfile
@@ -1,10 +1,31 @@
-FROM buildpack-deps:stretch
+FROM debian:stretch-slim
 LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <[email protected]>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar.bz2 \
+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 \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar.bz2 \
     && echo 'e34ff38c54857f431f37403b757267c9998152bf46b5c750b462f62461279b10 *perl-5.24.4.tar.bz2' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.24.4.tar.bz2 -C /usr/src/perl \
     && rm perl-5.24.4.tar.bz2 \
@@ -20,6 +41,11 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar
     && curl -LO http://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 \
+    && savedPackages="make netbase" \
+    && 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 ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root
diff --git a/perl_5.24.4-threaded/Dockerfile b/perl_5.24.4-threaded/Dockerfile
index 604d4a1..e08f0f8 100644
--- a/perl_5.24.4-threaded/Dockerfile
+++ b/perl_5.24.4-threaded/Dockerfile
@@ -4,7 +4,8 @@ LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <zakame@c
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar.bz2 \
+RUN true \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar.bz2 \
     && echo 'e34ff38c54857f431f37403b757267c9998152bf46b5c750b462f62461279b10 *perl-5.24.4.tar.bz2' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.24.4.tar.bz2 -C /usr/src/perl \
     && rm perl-5.24.4.tar.bz2 \
@@ -20,6 +21,7 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar
     && curl -LO http://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 \
+    && true \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root
diff --git a/perl_5.24.4/Dockerfile b/perl_5.24.4/Dockerfile
index 70137f8..4039976 100644
--- a/perl_5.24.4/Dockerfile
+++ b/perl_5.24.4/Dockerfile
@@ -4,7 +4,8 @@ LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <zakame@c
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar.bz2 \
+RUN true \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar.bz2 \
     && echo 'e34ff38c54857f431f37403b757267c9998152bf46b5c750b462f62461279b10 *perl-5.24.4.tar.bz2' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.24.4.tar.bz2 -C /usr/src/perl \
     && rm perl-5.24.4.tar.bz2 \
@@ -20,6 +21,7 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.bz2 -o perl-5.24.4.tar
     && curl -LO http://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 \
+    && true \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root
diff --git a/perl_5.26.2-threaded/DevelPatchPerl.patch b/perl_5.26.2-slim-threaded/DevelPatchPerl.patch
similarity index 100%
copy from perl_5.26.2-threaded/DevelPatchPerl.patch
copy to perl_5.26.2-slim-threaded/DevelPatchPerl.patch
diff --git a/perl_5.26.2-threaded/Dockerfile b/perl_5.26.2-slim-threaded/Dockerfile
similarity index 62%
copy from perl_5.26.2-threaded/Dockerfile
copy to perl_5.26.2-slim-threaded/Dockerfile
index a78507b..8f9acb6 100644
--- a/perl_5.26.2-threaded/Dockerfile
+++ b/perl_5.26.2-slim-threaded/Dockerfile
@@ -1,10 +1,31 @@
-FROM buildpack-deps:stretch
+FROM debian:stretch-slim
 LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <[email protected]>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar.bz2 \
+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 \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar.bz2 \
     && echo '3f6a6b5bbd43016e5211e24b6631ea84216dd300216a2293b41c9195032f3e81 *perl-5.26.2.tar.bz2' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.26.2.tar.bz2 -C /usr/src/perl \
     && rm perl-5.26.2.tar.bz2 \
@@ -20,6 +41,11 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar
     && curl -LO http://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 \
+    && savedPackages="make netbase" \
+    && 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 ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root
diff --git a/perl_5.26.2-threaded/DevelPatchPerl.patch b/perl_5.26.2-slim/DevelPatchPerl.patch
similarity index 100%
copy from perl_5.26.2-threaded/DevelPatchPerl.patch
copy to perl_5.26.2-slim/DevelPatchPerl.patch
diff --git a/perl_5.26.2/Dockerfile b/perl_5.26.2-slim/Dockerfile
similarity index 62%
copy from perl_5.26.2/Dockerfile
copy to perl_5.26.2-slim/Dockerfile
index 999d4a3..23cc86c 100644
--- a/perl_5.26.2/Dockerfile
+++ b/perl_5.26.2-slim/Dockerfile
@@ -1,10 +1,31 @@
-FROM buildpack-deps:stretch
+FROM debian:stretch-slim
 LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <[email protected]>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar.bz2 \
+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 \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar.bz2 \
     && echo '3f6a6b5bbd43016e5211e24b6631ea84216dd300216a2293b41c9195032f3e81 *perl-5.26.2.tar.bz2' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.26.2.tar.bz2 -C /usr/src/perl \
     && rm perl-5.26.2.tar.bz2 \
@@ -20,6 +41,11 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar
     && curl -LO http://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 \
+    && savedPackages="make netbase" \
+    && 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 ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root
diff --git a/perl_5.26.2-threaded/Dockerfile b/perl_5.26.2-threaded/Dockerfile
index a78507b..0319e95 100644
--- a/perl_5.26.2-threaded/Dockerfile
+++ b/perl_5.26.2-threaded/Dockerfile
@@ -4,7 +4,8 @@ LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <zakame@c
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar.bz2 \
+RUN true \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar.bz2 \
     && echo '3f6a6b5bbd43016e5211e24b6631ea84216dd300216a2293b41c9195032f3e81 *perl-5.26.2.tar.bz2' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.26.2.tar.bz2 -C /usr/src/perl \
     && rm perl-5.26.2.tar.bz2 \
@@ -20,6 +21,7 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar
     && curl -LO http://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 \
+    && true \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root
diff --git a/perl_5.26.2/Dockerfile b/perl_5.26.2/Dockerfile
index 999d4a3..c77931d 100644
--- a/perl_5.26.2/Dockerfile
+++ b/perl_5.26.2/Dockerfile
@@ -4,7 +4,8 @@ LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <zakame@c
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar.bz2 \
+RUN true \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar.bz2 \
     && echo '3f6a6b5bbd43016e5211e24b6631ea84216dd300216a2293b41c9195032f3e81 *perl-5.26.2.tar.bz2' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.26.2.tar.bz2 -C /usr/src/perl \
     && rm perl-5.26.2.tar.bz2 \
@@ -20,6 +21,7 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.26.2.tar.bz2 -o perl-5.26.2.tar
     && curl -LO http://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 \
+    && true \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root
diff --git a/perl_5.26.2-threaded/DevelPatchPerl.patch b/perl_5.28.0-slim-threaded/DevelPatchPerl.patch
similarity index 100%
copy from perl_5.26.2-threaded/DevelPatchPerl.patch
copy to perl_5.28.0-slim-threaded/DevelPatchPerl.patch
diff --git a/perl_5.28.0-threaded/Dockerfile b/perl_5.28.0-slim-threaded/Dockerfile
similarity index 62%
copy from perl_5.28.0-threaded/Dockerfile
copy to perl_5.28.0-slim-threaded/Dockerfile
index c264dcc..0fab658 100644
--- a/perl_5.28.0-threaded/Dockerfile
+++ b/perl_5.28.0-slim-threaded/Dockerfile
@@ -1,10 +1,31 @@
-FROM buildpack-deps:stretch
+FROM debian:stretch-slim
 LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <[email protected]>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.xz \
+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 \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.xz \
     && echo '059b3cb69970d8c8c5964caced0335b4af34ac990c8e61f7e3f90cd1c2d11e49 *perl-5.28.0.tar.xz' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.28.0.tar.xz -C /usr/src/perl \
     && rm perl-5.28.0.tar.xz \
@@ -20,6 +41,11 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.
     && curl -LO http://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 \
+    && savedPackages="make netbase" \
+    && 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 ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root
diff --git a/perl_5.26.2-threaded/DevelPatchPerl.patch b/perl_5.28.0-slim/DevelPatchPerl.patch
similarity index 100%
copy from perl_5.26.2-threaded/DevelPatchPerl.patch
copy to perl_5.28.0-slim/DevelPatchPerl.patch
diff --git a/perl_5.28.0/Dockerfile b/perl_5.28.0-slim/Dockerfile
similarity index 62%
copy from perl_5.28.0/Dockerfile
copy to perl_5.28.0-slim/Dockerfile
index d009951..67fb448 100644
--- a/perl_5.28.0/Dockerfile
+++ b/perl_5.28.0-slim/Dockerfile
@@ -1,10 +1,31 @@
-FROM buildpack-deps:stretch
+FROM debian:stretch-slim
 LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <[email protected]>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.xz \
+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 \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.xz \
     && echo '059b3cb69970d8c8c5964caced0335b4af34ac990c8e61f7e3f90cd1c2d11e49 *perl-5.28.0.tar.xz' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.28.0.tar.xz -C /usr/src/perl \
     && rm perl-5.28.0.tar.xz \
@@ -20,6 +41,11 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.
     && curl -LO http://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 \
+    && savedPackages="make netbase" \
+    && 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 ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root
diff --git a/perl_5.28.0-threaded/Dockerfile b/perl_5.28.0-threaded/Dockerfile
index c264dcc..53a733c 100644
--- a/perl_5.28.0-threaded/Dockerfile
+++ b/perl_5.28.0-threaded/Dockerfile
@@ -4,7 +4,8 @@ LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <zakame@c
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.xz \
+RUN true \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.xz \
     && echo '059b3cb69970d8c8c5964caced0335b4af34ac990c8e61f7e3f90cd1c2d11e49 *perl-5.28.0.tar.xz' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.28.0.tar.xz -C /usr/src/perl \
     && rm perl-5.28.0.tar.xz \
@@ -20,6 +21,7 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.
     && curl -LO http://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 \
+    && true \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root
diff --git a/perl_5.28.0/Dockerfile b/perl_5.28.0/Dockerfile
index d009951..67ef39d 100644
--- a/perl_5.28.0/Dockerfile
+++ b/perl_5.28.0/Dockerfile
@@ -4,7 +4,8 @@ LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <zakame@c
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.xz \
+RUN true \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.xz \
     && echo '059b3cb69970d8c8c5964caced0335b4af34ac990c8e61f7e3f90cd1c2d11e49 *perl-5.28.0.tar.xz' | sha256sum -c - \
     && tar --strip-components=1 -xaf perl-5.28.0.tar.xz -C /usr/src/perl \
     && rm perl-5.28.0.tar.xz \
@@ -20,6 +21,7 @@ RUN curl -SL https://www.cpan.org/src/5.0/perl-5.28.0.tar.xz -o perl-5.28.0.tar.
     && curl -LO http://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 \
+    && true \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /root

@yosifkit
Copy link
Member

Build test of #4715; 1589da0; amd64 (perl):

$ bashbrew build perl:latest
Building bashbrew/cache:37c3e1468820b3168a69ae1972804d7f24a6f0a45c87783cd265bd2ec75501b5 (perl:latest)
Tagging perl:latest
Tagging perl:5
Tagging perl:5.28
Tagging perl:5.28.0

$ test/run.sh perl:latest
testing perl:latest
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed


$ bashbrew build perl:slim
Building bashbrew/cache:b90e974bd60c7c8eeb1fdb13510a73a05356ea450cfa4888672a177ab9789e9d (perl:slim)
Tagging perl:slim
Tagging perl:5-slim
Tagging perl:5.28-slim
Tagging perl:5.28.0-slim

$ test/run.sh perl:slim
testing perl:slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed


$ bashbrew build perl:threaded
Building bashbrew/cache:fcdfd8a7616b72fc18570a370946c48f637a96bc909a21f89836112f63b0b6e3 (perl:threaded)
Tagging perl:threaded
Tagging perl:5-threaded
Tagging perl:5.28-threaded
Tagging perl:5.28.0-threaded

$ test/run.sh perl:threaded
testing perl:threaded
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed


$ bashbrew build perl:slim-threaded
Building bashbrew/cache:597f4c938186cd93726b623be758cefc1147a9655b22d27f7167ee4fdb320e6e (perl:slim-threaded)
Tagging perl:slim-threaded
Tagging perl:5-slim-threaded
Tagging perl:5.28-slim-threaded
Tagging perl:5.28.0-slim-threaded

$ test/run.sh perl:slim-threaded
testing perl:slim-threaded
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed


$ bashbrew build perl:5.26
Building bashbrew/cache:029891849221cafd32c71c48ea790ae001c7235f8f06bb5d10c1baa3bd7334b1 (perl:5.26)
Tagging perl:5.26
Tagging perl:5.26.2

$ test/run.sh perl:5.26
testing perl:5.26
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed


$ bashbrew build perl:5.26-slim
Building bashbrew/cache:243810ea7c97f581b5c5c8b7166effa0ad748ae78ae903942ceb0bc4b5b1af55 (perl:5.26-slim)
Tagging perl:5.26-slim
Tagging perl:5.26.2-slim

$ test/run.sh perl:5.26-slim
testing perl:5.26-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed


$ bashbrew build perl:5.26-threaded
Building bashbrew/cache:aa5309695f2ec2fbbc0e12051bb8450e1809b6626f9539b4f519bb9b3f212f09 (perl:5.26-threaded)
Tagging perl:5.26-threaded
Tagging perl:5.26.2-threaded

$ test/run.sh perl:5.26-threaded
testing perl:5.26-threaded
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed


$ bashbrew build perl:5.26-slim-threaded
Building bashbrew/cache:f44d6a32a85b05014677e044ffff6f635ac1e035e2d23f8bb48ca86919628504 (perl:5.26-slim-threaded)
Tagging perl:5.26-slim-threaded
Tagging perl:5.26.2-slim-threaded

$ test/run.sh perl:5.26-slim-threaded
testing perl:5.26-slim-threaded
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed


$ bashbrew build perl:5.24
Building bashbrew/cache:d68d7c817dfb27c614de27c13c8f5f833768ee3bfa7aad8018c19594ed7541d1 (perl:5.24)
Tagging perl:5.24
Tagging perl:5.24.4

$ test/run.sh perl:5.24
testing perl:5.24
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed


$ bashbrew build perl:5.24-slim
Building bashbrew/cache:ebb0d60fa2a5dae323deb581c1d2dccdc0c715c525e7edbb0365b0d0a273a4ad (perl:5.24-slim)
Tagging perl:5.24-slim
Tagging perl:5.24.4-slim

$ test/run.sh perl:5.24-slim
testing perl:5.24-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed


$ bashbrew build perl:5.24-threaded
Building bashbrew/cache:6e4f5b7a6d4ace4de21da9dd5a0576d154e8d099f10f86c1e7a1f6e0166e8af2 (perl:5.24-threaded)
Tagging perl:5.24-threaded
Tagging perl:5.24.4-threaded

$ test/run.sh perl:5.24-threaded
testing perl:5.24-threaded
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed


$ bashbrew build perl:5.24-slim-threaded
Building bashbrew/cache:aeac4e024b220a08b3f83a370b8f6fc4359533f4b8a5428cce4f2ebb37c24242 (perl:5.24-slim-threaded)
Tagging perl:5.24-slim-threaded
Tagging perl:5.24.4-slim-threaded

$ test/run.sh perl:5.24-slim-threaded
testing perl:5.24-slim-threaded
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'perl-hello-world' [5/5]...passed

@yosifkit yosifkit merged commit 13bfb33 into docker-library:master Aug 13, 2018
@zakame
Copy link
Contributor Author

zakame commented Aug 14, 2018

Thanks @yosifkit ! 🎉

@zakame zakame deleted the update-perl branch August 14, 2018 05:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants