simcop2387/docker-perl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity

Merge pull request #9 from tianon/sha1

Browse source 
Remove sha1.txt and embed it in the Dockerfile
This commit is contained in:
Peter Martini 2015-02-02 16:48:04 -05:00
commit 3974509cdf
9 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
5.018.004-64bit,threaded/Dockerfile
View file

@ -8,11 +8,10 @@ RUN apt-get update \
RUN mkdir /usr/src/perl RUN mkdir /usr/src/perl
WORKDIR /usr/src/perl WORKDIR /usr/src/perl
COPY sha1.txt /tmp/sha1.txt
RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.18.4.tar.bz2 -o perl-5.18.4.tar.bz2 \ RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.18.4.tar.bz2 -o perl-5.18.4.tar.bz2 \
&& sha1sum -c /tmp/sha1.txt \ && echo '69c34558a0a939a7adbbc1de48c06ea418d81e27 *perl-5.18.4.tar.bz2' | sha1sum -c - \
&& tar --strip-components=1 -xjf perl-5.18.4.tar.bz2 -C /usr/src/perl \ && tar --strip-components=1 -xjf perl-5.18.4.tar.bz2 -C /usr/src/perl \
&& rm perl-5.18.4.tar.bz2 /tmp/sha1.txt \ && rm perl-5.18.4.tar.bz2 \
&& ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \ && ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
&& make -j$(nproc) \ && make -j$(nproc) \
&& TEST_JOBS=$(nproc) make test_harness \ && TEST_JOBS=$(nproc) make test_harness \

1
5.018.004-64bit,threaded/sha1.txt
View file

@ -1 +0,0 @@
69c34558a0a939a7adbbc1de48c06ea418d81e27 perl-5.18.4.tar.bz2

5
5.018.004-64bit/Dockerfile
View file

@ -8,11 +8,10 @@ RUN apt-get update \
RUN mkdir /usr/src/perl RUN mkdir /usr/src/perl
WORKDIR /usr/src/perl WORKDIR /usr/src/perl
COPY sha1.txt /tmp/sha1.txt
RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.18.4.tar.bz2 -o perl-5.18.4.tar.bz2 \ RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.18.4.tar.bz2 -o perl-5.18.4.tar.bz2 \
&& sha1sum -c /tmp/sha1.txt \ && echo '69c34558a0a939a7adbbc1de48c06ea418d81e27 *perl-5.18.4.tar.bz2' | sha1sum -c - \
&& tar --strip-components=1 -xjf perl-5.18.4.tar.bz2 -C /usr/src/perl \ && tar --strip-components=1 -xjf perl-5.18.4.tar.bz2 -C /usr/src/perl \
&& rm perl-5.18.4.tar.bz2 /tmp/sha1.txt \ && rm perl-5.18.4.tar.bz2 \
&& ./Configure -Duse64bitall -A ccflags=-fwrapv -des \ && ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
&& make -j$(nproc) \ && make -j$(nproc) \
&& TEST_JOBS=$(nproc) make test_harness \ && TEST_JOBS=$(nproc) make test_harness \

1
5.018.004-64bit/sha1.txt
View file

@ -1 +0,0 @@
69c34558a0a939a7adbbc1de48c06ea418d81e27 perl-5.18.4.tar.bz2

5
5.020.001-64bit,threaded/Dockerfile
View file

@ -8,11 +8,10 @@ RUN apt-get update \
RUN mkdir /usr/src/perl RUN mkdir /usr/src/perl
WORKDIR /usr/src/perl WORKDIR /usr/src/perl
COPY sha1.txt /tmp/sha1.txt
RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.1.tar.bz2 -o perl-5.20.1.tar.bz2 \ RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.1.tar.bz2 -o perl-5.20.1.tar.bz2 \
&& sha1sum -c /tmp/sha1.txt \ && echo 'cd424d1520ba2686fe5d4422565aaf880e9467f6 *perl-5.20.1.tar.bz2' | sha1sum -c - \
&& tar --strip-components=1 -xjf perl-5.20.1.tar.bz2 -C /usr/src/perl \ && tar --strip-components=1 -xjf perl-5.20.1.tar.bz2 -C /usr/src/perl \
&& rm perl-5.20.1.tar.bz2 /tmp/sha1.txt \ && rm perl-5.20.1.tar.bz2 \
&& ./Configure -Dusethreads -Duse64bitall -des \ && ./Configure -Dusethreads -Duse64bitall -des \
&& make -j$(nproc) \ && make -j$(nproc) \
&& TEST_JOBS=$(nproc) make test_harness \ && TEST_JOBS=$(nproc) make test_harness \

1
5.020.001-64bit,threaded/sha1.txt
View file

@ -1 +0,0 @@
cd424d1520ba2686fe5d4422565aaf880e9467f6 perl-5.20.1.tar.bz2

5
5.020.001-64bit/Dockerfile
View file

@ -8,11 +8,10 @@ RUN apt-get update \
RUN mkdir /usr/src/perl RUN mkdir /usr/src/perl
WORKDIR /usr/src/perl WORKDIR /usr/src/perl
COPY sha1.txt /tmp/sha1.txt
RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.1.tar.bz2 -o perl-5.20.1.tar.bz2 \ RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.1.tar.bz2 -o perl-5.20.1.tar.bz2 \
&& sha1sum -c /tmp/sha1.txt \ && echo 'cd424d1520ba2686fe5d4422565aaf880e9467f6 *perl-5.20.1.tar.bz2' | sha1sum -c - \
&& tar --strip-components=1 -xjf perl-5.20.1.tar.bz2 -C /usr/src/perl \ && tar --strip-components=1 -xjf perl-5.20.1.tar.bz2 -C /usr/src/perl \
&& rm perl-5.20.1.tar.bz2 /tmp/sha1.txt \ && rm perl-5.20.1.tar.bz2 \
&& ./Configure -Duse64bitall -des \ && ./Configure -Duse64bitall -des \
&& make -j$(nproc) \ && make -j$(nproc) \
&& TEST_JOBS=$(nproc) make test_harness \ && TEST_JOBS=$(nproc) make test_harness \

1
5.020.001-64bit/sha1.txt
View file

@ -1 +0,0 @@
cd424d1520ba2686fe5d4422565aaf880e9467f6 perl-5.20.1.tar.bz2

11
generate.pl
View file

@ -49,17 +49,13 @@ for my $release (@{$yaml->{releases}}) {
for my $config (keys %builds) { for my $config (keys %builds) {
my $output = $template; my $output = $template;
$output =~ s/{{$_}}/$release->{$_}/mg for (qw(version pause extra_flags)); $output =~ s/{{$_}}/$release->{$_}/mg for (qw(version pause extra_flags sha1));
$output =~ s/{{args}}/$builds{$config}/mg; $output =~ s/{{args}}/$builds{$config}/mg;
my $dir = sprintf "%i.%03i.%03i-%s", my $dir = sprintf "%i.%03i.%03i-%s",
($release->{version} =~ /(\d+)\.(\d+)\.(\d+)/), ($release->{version} =~ /(\d+)\.(\d+)\.(\d+)/),
$config; $config;
open my $sha1, ">$dir/sha1.txt" or die "Couldn't open $dir/sha1.txt for writing";
print $sha1 "$release->{sha1} perl-$release->{version}.tar.bz2\n";
close $sha1;
open my $dockerfile, ">$dir/Dockerfile" or die "Couldn't open $dir/Dockerfile for writing"; open my $dockerfile, ">$dir/Dockerfile" or die "Couldn't open $dir/Dockerfile for writing";
print $dockerfile $output; print $dockerfile $output;
close $dockerfile; close $dockerfile;
@ -116,11 +112,10 @@ RUN apt-get update \
RUN mkdir /usr/src/perl RUN mkdir /usr/src/perl
WORKDIR /usr/src/perl WORKDIR /usr/src/perl
COPY sha1.txt /tmp/sha1.txt
RUN curl -SL https://cpan.metacpan.org/authors/id/{{pause}}/perl-{{version}}.tar.bz2 -o perl-{{version}}.tar.bz2 \ RUN curl -SL https://cpan.metacpan.org/authors/id/{{pause}}/perl-{{version}}.tar.bz2 -o perl-{{version}}.tar.bz2 \
&& sha1sum -c /tmp/sha1.txt \ && echo '{{sha1}} *perl-{{version}}.tar.bz2' | sha1sum -c - \
&& tar --strip-components=1 -xjf perl-{{version}}.tar.bz2 -C /usr/src/perl \ && tar --strip-components=1 -xjf perl-{{version}}.tar.bz2 -C /usr/src/perl \
&& rm perl-{{version}}.tar.bz2 /tmp/sha1.txt \ && rm perl-{{version}}.tar.bz2 \
&& ./Configure {{args}} {{extra_flags}} -des \ && ./Configure {{args}} {{extra_flags}} -des \
&& make -j$(nproc) \ && make -j$(nproc) \
&& TEST_JOBS=$(nproc) make test_harness \ && TEST_JOBS=$(nproc) make test_harness \