From f9a100bdfa8e43bd9d6926b1a6f10abc3db28345 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Sat, 29 Jul 2017 13:01:49 +0800 Subject: [PATCH 1/6] Remove first RUN layer for installing curl and procps This is unneeded now that buildpack-deps pulls these in via its own `buildpack-deps:curl` and `buildpack-deps:scm` base images. --- 5.008.009-64bit,threaded/Dockerfile | 4 ---- 5.008.009-64bit/Dockerfile | 4 ---- 5.010.001-64bit,threaded/Dockerfile | 4 ---- 5.010.001-64bit/Dockerfile | 4 ---- 5.012.005-64bit,threaded/Dockerfile | 4 ---- 5.012.005-64bit/Dockerfile | 4 ---- 5.014.004-64bit,threaded/Dockerfile | 4 ---- 5.014.004-64bit/Dockerfile | 4 ---- 5.016.003-64bit,threaded/Dockerfile | 4 ---- 5.016.003-64bit/Dockerfile | 4 ---- 5.018.004-64bit,threaded/Dockerfile | 4 ---- 5.018.004-64bit/Dockerfile | 4 ---- 5.020.003-64bit,threaded/Dockerfile | 4 ---- 5.020.003-64bit/Dockerfile | 4 ---- 5.022.004-64bit,threaded/Dockerfile | 4 ---- 5.022.004-64bit/Dockerfile | 4 ---- 5.024.002-64bit,threaded/Dockerfile | 4 ---- 5.024.002-64bit/Dockerfile | 4 ---- 5.026.000-64bit,threaded/Dockerfile | 4 ---- 5.026.000-64bit/Dockerfile | 4 ---- generate.pl | 4 ---- 21 files changed, 84 deletions(-) diff --git a/5.008.009-64bit,threaded/Dockerfile b/5.008.009-64bit,threaded/Dockerfile index 670d480a..3e14d1de 100644 --- a/5.008.009-64bit,threaded/Dockerfile +++ b/5.008.009-64bit,threaded/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.008.009-64bit/Dockerfile b/5.008.009-64bit/Dockerfile index 061b1905..4155e12e 100644 --- a/5.008.009-64bit/Dockerfile +++ b/5.008.009-64bit/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.010.001-64bit,threaded/Dockerfile b/5.010.001-64bit,threaded/Dockerfile index 913f3857..82640e3a 100644 --- a/5.010.001-64bit,threaded/Dockerfile +++ b/5.010.001-64bit,threaded/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.010.001-64bit/Dockerfile b/5.010.001-64bit/Dockerfile index 6febf62b..7541e65b 100644 --- a/5.010.001-64bit/Dockerfile +++ b/5.010.001-64bit/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.012.005-64bit,threaded/Dockerfile b/5.012.005-64bit,threaded/Dockerfile index 20796542..80756228 100644 --- a/5.012.005-64bit,threaded/Dockerfile +++ b/5.012.005-64bit,threaded/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.012.005-64bit/Dockerfile b/5.012.005-64bit/Dockerfile index 8675620e..47447139 100644 --- a/5.012.005-64bit/Dockerfile +++ b/5.012.005-64bit/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.014.004-64bit,threaded/Dockerfile b/5.014.004-64bit,threaded/Dockerfile index c083e466..e21b1ab6 100644 --- a/5.014.004-64bit,threaded/Dockerfile +++ b/5.014.004-64bit,threaded/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.014.004-64bit/Dockerfile b/5.014.004-64bit/Dockerfile index 0088b889..04e825e5 100644 --- a/5.014.004-64bit/Dockerfile +++ b/5.014.004-64bit/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.016.003-64bit,threaded/Dockerfile b/5.016.003-64bit,threaded/Dockerfile index 83f69887..b6cf5b43 100644 --- a/5.016.003-64bit,threaded/Dockerfile +++ b/5.016.003-64bit,threaded/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.016.003-64bit/Dockerfile b/5.016.003-64bit/Dockerfile index 7d9378cc..748b5e5b 100644 --- a/5.016.003-64bit/Dockerfile +++ b/5.016.003-64bit/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.018.004-64bit,threaded/Dockerfile b/5.018.004-64bit,threaded/Dockerfile index f95bb9a0..91efedd2 100644 --- a/5.018.004-64bit,threaded/Dockerfile +++ b/5.018.004-64bit,threaded/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.018.004-64bit/Dockerfile b/5.018.004-64bit/Dockerfile index e33b9c4d..98fd0338 100644 --- a/5.018.004-64bit/Dockerfile +++ b/5.018.004-64bit/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.020.003-64bit,threaded/Dockerfile b/5.020.003-64bit,threaded/Dockerfile index 848f2683..10abb88c 100644 --- a/5.020.003-64bit,threaded/Dockerfile +++ b/5.020.003-64bit,threaded/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.020.003-64bit/Dockerfile b/5.020.003-64bit/Dockerfile index 3aa33636..6804eb36 100644 --- a/5.020.003-64bit/Dockerfile +++ b/5.020.003-64bit/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.022.004-64bit,threaded/Dockerfile b/5.022.004-64bit,threaded/Dockerfile index c2b9d290..1f227947 100644 --- a/5.022.004-64bit,threaded/Dockerfile +++ b/5.022.004-64bit,threaded/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.022.004-64bit/Dockerfile b/5.022.004-64bit/Dockerfile index bc2b5953..1465b749 100644 --- a/5.022.004-64bit/Dockerfile +++ b/5.022.004-64bit/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.024.002-64bit,threaded/Dockerfile b/5.024.002-64bit,threaded/Dockerfile index 951e5eeb..d5a76c73 100644 --- a/5.024.002-64bit,threaded/Dockerfile +++ b/5.024.002-64bit,threaded/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.024.002-64bit/Dockerfile b/5.024.002-64bit/Dockerfile index fc007bbd..e9b19502 100644 --- a/5.024.002-64bit/Dockerfile +++ b/5.024.002-64bit/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.026.000-64bit,threaded/Dockerfile b/5.026.000-64bit,threaded/Dockerfile index 6046bb8b..9c7dd6a1 100644 --- a/5.026.000-64bit,threaded/Dockerfile +++ b/5.026.000-64bit,threaded/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.026.000-64bit/Dockerfile b/5.026.000-64bit/Dockerfile index 1e0acec1..3d89611a 100644 --- a/5.026.000-64bit/Dockerfile +++ b/5.026.000-64bit/Dockerfile @@ -1,10 +1,6 @@ FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/generate.pl b/generate.pl index ef70fb83..72e5d5a4 100755 --- a/generate.pl +++ b/generate.pl @@ -187,10 +187,6 @@ =head1 DESCRIPTION FROM buildpack-deps MAINTAINER Peter Martini -RUN apt-get update \ - && apt-get install -y curl procps \ - && rm -fr /var/lib/apt/lists/* - RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl From fac8efb5f8323fb485ba424bd1cbb799a1d1a4e5 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Sat, 29 Jul 2017 16:16:04 +0800 Subject: [PATCH 2/6] Add `buildpack_deps` option to generate.pl Enable specifying what `buildpack-deps` tagged image to use on Perl image builds, defaulting to `stretch` at this time. --- generate.pl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/generate.pl b/generate.pl index 72e5d5a4..b43060f6 100755 --- a/generate.pl +++ b/generate.pl @@ -90,10 +90,11 @@ sub die_with_sample { $release->{pause} =~ s#(((.).).*)#$3/$2/$1#; $release->{extra_flags} = "" unless defined $release->{extra_flags}; + $release->{_tag} = $release->{buildpack_deps} || "stretch"; for my $config (keys %builds) { my $output = $template; - $output =~ s/\{\{$_\}\}/$release->{$_}/mg for (qw(version pause extra_flags sha256)); + $output =~ s/\{\{$_\}\}/$release->{$_}/mg for (qw(version pause extra_flags sha256 _tag)); $output =~ s/\{\{args\}\}/$builds{$config}/mg; my $dir = sprintf "%i.%03i.%03i-%s", @@ -162,6 +163,13 @@ =head1 DESCRIPTION =over 4 +=item buildpack_deps + +The Docker L +image tag which this Perl would build on. + +Defaults: C + =item extra_flags Additional text to pass to C. At the moment, this is necessary for @@ -184,7 +192,7 @@ =head1 DESCRIPTION =cut __DATA__ -FROM buildpack-deps +FROM buildpack_deps:{{_tag}} MAINTAINER Peter Martini RUN mkdir /usr/src/perl From 0288f332b6c191c80e2704c39bb46d8e46defec8 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Sat, 29 Jul 2017 16:18:04 +0800 Subject: [PATCH 3/6] Use `buildpack-deps:jessie` on Perls < 5.20 This lets us build older Perls on their contemporary build stack. --- Releases.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Releases.yaml b/Releases.yaml index fab82687..5e5655d5 100644 --- a/Releases.yaml +++ b/Releases.yaml @@ -4,36 +4,42 @@ releases: pause: NWCLARK extra_flags: "-A ccflags=-fwrapv" test_parallel: no + buildpack_deps: jessie - version: 5.10.1 sha256: 9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826 pause: DAPM extra_flags: "-A ccflags=-fwrapv" test_parallel: no + buildpack_deps: jessie - version: 5.12.5 sha256: 10749417fd3010aae320a34181ad4cd6a4855c1fc63403b87fa4d630b18e966c pause: DOM extra_flags: "-A ccflags=-fwrapv" test_parallel: no + buildpack_deps: jessie - version: 5.14.4 sha256: eece8c2b0d491bf6f746bd1f4f1bb7ce26f6b98e91c54690c617d7af38964745 pause: DAPM extra_flags: "-A ccflags=-fwrapv" test_parallel: no + buildpack_deps: jessie - version: 5.16.3 sha256: bb7bc735e6813b177dcfccd480defcde7eddefa173b5967eac11babd1bfa98e8 pause: RJBS extra_flags: "-A ccflags=-fwrapv" test_parallel: no + buildpack_deps: jessie - version: 5.18.4 sha256: 1fb4d27b75cd244e849f253320260efe1750641aaff4a18ce0d67556ff1b96a5 pause: RJBS extra_flags: "-A ccflags=-fwrapv" test_parallel: no + buildpack_deps: jessie - version: 5.20.3 sha256: 1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b From c956a809620ba5d7a993eff0f485e1e24f1ab947 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Sat, 29 Jul 2017 16:31:27 +0800 Subject: [PATCH 4/6] Fix typo --- generate.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.pl b/generate.pl index b43060f6..d472026b 100755 --- a/generate.pl +++ b/generate.pl @@ -192,7 +192,7 @@ =head1 DESCRIPTION =cut __DATA__ -FROM buildpack_deps:{{_tag}} +FROM buildpack-deps:{{_tag}} MAINTAINER Peter Martini RUN mkdir /usr/src/perl From dce0132daef0c97944587e02a4692673456d37d6 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Sat, 29 Jul 2017 16:31:57 +0800 Subject: [PATCH 5/6] Regenerate Dockerfiles to use tagged buildpack-deps Thanks generate.pl! --- 5.008.009-64bit,threaded/Dockerfile | 2 +- 5.008.009-64bit/Dockerfile | 2 +- 5.010.001-64bit,threaded/Dockerfile | 2 +- 5.010.001-64bit/Dockerfile | 2 +- 5.012.005-64bit,threaded/Dockerfile | 2 +- 5.012.005-64bit/Dockerfile | 2 +- 5.014.004-64bit,threaded/Dockerfile | 2 +- 5.014.004-64bit/Dockerfile | 2 +- 5.016.003-64bit,threaded/Dockerfile | 2 +- 5.016.003-64bit/Dockerfile | 2 +- 5.018.004-64bit,threaded/Dockerfile | 2 +- 5.018.004-64bit/Dockerfile | 2 +- 5.020.003-64bit,threaded/Dockerfile | 2 +- 5.020.003-64bit/Dockerfile | 2 +- 5.022.004-64bit,threaded/Dockerfile | 2 +- 5.022.004-64bit/Dockerfile | 2 +- 5.024.002-64bit,threaded/Dockerfile | 2 +- 5.024.002-64bit/Dockerfile | 2 +- 5.026.000-64bit,threaded/Dockerfile | 2 +- 5.026.000-64bit/Dockerfile | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/5.008.009-64bit,threaded/Dockerfile b/5.008.009-64bit,threaded/Dockerfile index 3e14d1de..6c77cd59 100644 --- a/5.008.009-64bit,threaded/Dockerfile +++ b/5.008.009-64bit,threaded/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.008.009-64bit/Dockerfile b/5.008.009-64bit/Dockerfile index 4155e12e..7b3e93d6 100644 --- a/5.008.009-64bit/Dockerfile +++ b/5.008.009-64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.010.001-64bit,threaded/Dockerfile b/5.010.001-64bit,threaded/Dockerfile index 82640e3a..0491262e 100644 --- a/5.010.001-64bit,threaded/Dockerfile +++ b/5.010.001-64bit,threaded/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.010.001-64bit/Dockerfile b/5.010.001-64bit/Dockerfile index 7541e65b..cebeb920 100644 --- a/5.010.001-64bit/Dockerfile +++ b/5.010.001-64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.012.005-64bit,threaded/Dockerfile b/5.012.005-64bit,threaded/Dockerfile index 80756228..fc5af98e 100644 --- a/5.012.005-64bit,threaded/Dockerfile +++ b/5.012.005-64bit,threaded/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.012.005-64bit/Dockerfile b/5.012.005-64bit/Dockerfile index 47447139..e54585cd 100644 --- a/5.012.005-64bit/Dockerfile +++ b/5.012.005-64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.014.004-64bit,threaded/Dockerfile b/5.014.004-64bit,threaded/Dockerfile index e21b1ab6..8f3a028f 100644 --- a/5.014.004-64bit,threaded/Dockerfile +++ b/5.014.004-64bit,threaded/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.014.004-64bit/Dockerfile b/5.014.004-64bit/Dockerfile index 04e825e5..ff16d1b6 100644 --- a/5.014.004-64bit/Dockerfile +++ b/5.014.004-64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.016.003-64bit,threaded/Dockerfile b/5.016.003-64bit,threaded/Dockerfile index b6cf5b43..a9d5edee 100644 --- a/5.016.003-64bit,threaded/Dockerfile +++ b/5.016.003-64bit,threaded/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.016.003-64bit/Dockerfile b/5.016.003-64bit/Dockerfile index 748b5e5b..d552583c 100644 --- a/5.016.003-64bit/Dockerfile +++ b/5.016.003-64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.018.004-64bit,threaded/Dockerfile b/5.018.004-64bit,threaded/Dockerfile index 91efedd2..733372b6 100644 --- a/5.018.004-64bit,threaded/Dockerfile +++ b/5.018.004-64bit,threaded/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.018.004-64bit/Dockerfile b/5.018.004-64bit/Dockerfile index 98fd0338..5a0d11b0 100644 --- a/5.018.004-64bit/Dockerfile +++ b/5.018.004-64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:jessie MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.020.003-64bit,threaded/Dockerfile b/5.020.003-64bit,threaded/Dockerfile index 10abb88c..28903c9f 100644 --- a/5.020.003-64bit,threaded/Dockerfile +++ b/5.020.003-64bit,threaded/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:stretch MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.020.003-64bit/Dockerfile b/5.020.003-64bit/Dockerfile index 6804eb36..e5b53262 100644 --- a/5.020.003-64bit/Dockerfile +++ b/5.020.003-64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:stretch MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.022.004-64bit,threaded/Dockerfile b/5.022.004-64bit,threaded/Dockerfile index 1f227947..95c1aa0b 100644 --- a/5.022.004-64bit,threaded/Dockerfile +++ b/5.022.004-64bit,threaded/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:stretch MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.022.004-64bit/Dockerfile b/5.022.004-64bit/Dockerfile index 1465b749..ffbcba65 100644 --- a/5.022.004-64bit/Dockerfile +++ b/5.022.004-64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:stretch MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.024.002-64bit,threaded/Dockerfile b/5.024.002-64bit,threaded/Dockerfile index d5a76c73..d60caa2c 100644 --- a/5.024.002-64bit,threaded/Dockerfile +++ b/5.024.002-64bit,threaded/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:stretch MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.024.002-64bit/Dockerfile b/5.024.002-64bit/Dockerfile index e9b19502..e253d799 100644 --- a/5.024.002-64bit/Dockerfile +++ b/5.024.002-64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:stretch MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.026.000-64bit,threaded/Dockerfile b/5.026.000-64bit,threaded/Dockerfile index 9c7dd6a1..0445007d 100644 --- a/5.026.000-64bit,threaded/Dockerfile +++ b/5.026.000-64bit,threaded/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:stretch MAINTAINER Peter Martini RUN mkdir /usr/src/perl diff --git a/5.026.000-64bit/Dockerfile b/5.026.000-64bit/Dockerfile index 3d89611a..dd1c0059 100644 --- a/5.026.000-64bit/Dockerfile +++ b/5.026.000-64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps +FROM buildpack-deps:stretch MAINTAINER Peter Martini RUN mkdir /usr/src/perl From 47745d17f727ab2a4864f01f9641e5a9f6bb7ac5 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Sat, 29 Jul 2017 17:13:16 +0800 Subject: [PATCH 6/6] Remove another RUN layer We don't need `mkdir` since COPY will already make the destination path for us. --- 5.008.009-64bit,threaded/Dockerfile | 1 - 5.008.009-64bit/Dockerfile | 1 - 5.010.001-64bit,threaded/Dockerfile | 1 - 5.010.001-64bit/Dockerfile | 1 - 5.012.005-64bit,threaded/Dockerfile | 1 - 5.012.005-64bit/Dockerfile | 1 - 5.014.004-64bit,threaded/Dockerfile | 1 - 5.014.004-64bit/Dockerfile | 1 - 5.016.003-64bit,threaded/Dockerfile | 1 - 5.016.003-64bit/Dockerfile | 1 - 5.018.004-64bit,threaded/Dockerfile | 1 - 5.018.004-64bit/Dockerfile | 1 - 5.020.003-64bit,threaded/Dockerfile | 1 - 5.020.003-64bit/Dockerfile | 1 - 5.022.004-64bit,threaded/Dockerfile | 1 - 5.022.004-64bit/Dockerfile | 1 - 5.024.002-64bit,threaded/Dockerfile | 1 - 5.024.002-64bit/Dockerfile | 1 - 5.026.000-64bit,threaded/Dockerfile | 1 - 5.026.000-64bit/Dockerfile | 1 - generate.pl | 1 - 21 files changed, 21 deletions(-) diff --git a/5.008.009-64bit,threaded/Dockerfile b/5.008.009-64bit,threaded/Dockerfile index 6c77cd59..1e88473a 100644 --- a/5.008.009-64bit,threaded/Dockerfile +++ b/5.008.009-64bit,threaded/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.008.009-64bit/Dockerfile b/5.008.009-64bit/Dockerfile index 7b3e93d6..16224477 100644 --- a/5.008.009-64bit/Dockerfile +++ b/5.008.009-64bit/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.010.001-64bit,threaded/Dockerfile b/5.010.001-64bit,threaded/Dockerfile index 0491262e..d71194ac 100644 --- a/5.010.001-64bit,threaded/Dockerfile +++ b/5.010.001-64bit,threaded/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.010.001-64bit/Dockerfile b/5.010.001-64bit/Dockerfile index cebeb920..2ea3a99f 100644 --- a/5.010.001-64bit/Dockerfile +++ b/5.010.001-64bit/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.012.005-64bit,threaded/Dockerfile b/5.012.005-64bit,threaded/Dockerfile index fc5af98e..48026849 100644 --- a/5.012.005-64bit,threaded/Dockerfile +++ b/5.012.005-64bit,threaded/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.012.005-64bit/Dockerfile b/5.012.005-64bit/Dockerfile index e54585cd..8531b473 100644 --- a/5.012.005-64bit/Dockerfile +++ b/5.012.005-64bit/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.014.004-64bit,threaded/Dockerfile b/5.014.004-64bit,threaded/Dockerfile index 8f3a028f..d2c3ca01 100644 --- a/5.014.004-64bit,threaded/Dockerfile +++ b/5.014.004-64bit,threaded/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.014.004-64bit/Dockerfile b/5.014.004-64bit/Dockerfile index ff16d1b6..c9bb974c 100644 --- a/5.014.004-64bit/Dockerfile +++ b/5.014.004-64bit/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.016.003-64bit,threaded/Dockerfile b/5.016.003-64bit,threaded/Dockerfile index a9d5edee..bfd7b787 100644 --- a/5.016.003-64bit,threaded/Dockerfile +++ b/5.016.003-64bit,threaded/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.016.003-64bit/Dockerfile b/5.016.003-64bit/Dockerfile index d552583c..8c130527 100644 --- a/5.016.003-64bit/Dockerfile +++ b/5.016.003-64bit/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.018.004-64bit,threaded/Dockerfile b/5.018.004-64bit,threaded/Dockerfile index 733372b6..92d414b3 100644 --- a/5.018.004-64bit,threaded/Dockerfile +++ b/5.018.004-64bit,threaded/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.018.004-64bit/Dockerfile b/5.018.004-64bit/Dockerfile index 5a0d11b0..b2af81f6 100644 --- a/5.018.004-64bit/Dockerfile +++ b/5.018.004-64bit/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:jessie MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.020.003-64bit,threaded/Dockerfile b/5.020.003-64bit,threaded/Dockerfile index 28903c9f..8cc7bd43 100644 --- a/5.020.003-64bit,threaded/Dockerfile +++ b/5.020.003-64bit,threaded/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:stretch MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.020.003-64bit/Dockerfile b/5.020.003-64bit/Dockerfile index e5b53262..f57da325 100644 --- a/5.020.003-64bit/Dockerfile +++ b/5.020.003-64bit/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:stretch MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.022.004-64bit,threaded/Dockerfile b/5.022.004-64bit,threaded/Dockerfile index 95c1aa0b..c3c0932f 100644 --- a/5.022.004-64bit,threaded/Dockerfile +++ b/5.022.004-64bit,threaded/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:stretch MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.022.004-64bit/Dockerfile b/5.022.004-64bit/Dockerfile index ffbcba65..d63ddc6c 100644 --- a/5.022.004-64bit/Dockerfile +++ b/5.022.004-64bit/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:stretch MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.024.002-64bit,threaded/Dockerfile b/5.024.002-64bit,threaded/Dockerfile index d60caa2c..7d34eb9c 100644 --- a/5.024.002-64bit,threaded/Dockerfile +++ b/5.024.002-64bit,threaded/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:stretch MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.024.002-64bit/Dockerfile b/5.024.002-64bit/Dockerfile index e253d799..a5d6df1b 100644 --- a/5.024.002-64bit/Dockerfile +++ b/5.024.002-64bit/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:stretch MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.026.000-64bit,threaded/Dockerfile b/5.026.000-64bit,threaded/Dockerfile index 0445007d..129e0701 100644 --- a/5.026.000-64bit,threaded/Dockerfile +++ b/5.026.000-64bit,threaded/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:stretch MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/5.026.000-64bit/Dockerfile b/5.026.000-64bit/Dockerfile index dd1c0059..ddba2f25 100644 --- a/5.026.000-64bit/Dockerfile +++ b/5.026.000-64bit/Dockerfile @@ -1,7 +1,6 @@ FROM buildpack-deps:stretch MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl diff --git a/generate.pl b/generate.pl index d472026b..9b6d6bb0 100755 --- a/generate.pl +++ b/generate.pl @@ -195,7 +195,6 @@ =head1 DESCRIPTION FROM buildpack-deps:{{_tag}} MAINTAINER Peter Martini -RUN mkdir /usr/src/perl COPY *.patch /usr/src/perl/ WORKDIR /usr/src/perl