Skip to content

Use tagged buildpack-deps #35

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Aug 11, 2017
Merged

Use tagged buildpack-deps #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9a100b
Remove first RUN layer for installing curl and procps
zakame Jul 29, 2017
fac8efb
Add `buildpack_deps` option to generate.pl
zakame Jul 29, 2017
0288f33
Use `buildpack-deps:jessie` on Perls < 5.20
zakame Jul 29, 2017
c956a80
Fix typo
zakame Jul 29, 2017
dce0132
Regenerate Dockerfiles to use tagged buildpack-deps
zakame Jul 29, 2017
47745d1
Remove another RUN layer
zakame Jul 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions 5.008.009-64bit,threaded/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.008.009-64bit/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.010.001-64bit,threaded/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.010.001-64bit/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.012.005-64bit,threaded/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.012.005-64bit/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.014.004-64bit,threaded/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.014.004-64bit/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.016.003-64bit,threaded/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.016.003-64bit/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.018.004-64bit,threaded/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.018.004-64bit/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:jessie
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.020.003-64bit,threaded/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:stretch
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.020.003-64bit/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:stretch
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.022.004-64bit,threaded/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:stretch
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.022.004-64bit/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:stretch
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.024.002-64bit,threaded/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:stretch
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.024.002-64bit/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:stretch
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.026.000-64bit,threaded/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:stretch
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
7 changes: 1 addition & 6 deletions 5.026.000-64bit/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM buildpack-deps
FROM buildpack-deps:stretch
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down
6 changes: 6 additions & 0 deletions Releases.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 10 additions & 7 deletions generate.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -162,6 +163,13 @@ =head1 DESCRIPTION

=over 4

=item buildpack_deps

The Docker L<buildpack-deps|https://hub.docker.com/_/buildpack-deps>
image tag which this Perl would build on.

Defaults: C<stretch>

=item extra_flags

Additional text to pass to C<Configure>. At the moment, this is necessary for
Expand All @@ -184,14 +192,9 @@ =head1 DESCRIPTION
=cut

__DATA__
FROM buildpack-deps
FROM buildpack-deps:{{_tag}}
MAINTAINER Peter Martini <PeterCMartini@GMail.com>

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

Expand Down