Merge pull request #9 from tianon/sha1

Remove sha1.txt and embed it in the Dockerfile

Author: PeterMartini

5.018.004-64bit,threaded/Dockerfile

@@ -8,11 +8,10 @@ RUN apt-get update \
 RUN mkdir /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 \
-    && 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 \
-    && rm perl-5.18.4.tar.bz2 /tmp/sha1.txt \
+    && rm perl-5.18.4.tar.bz2 \
     && ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
     && make -j$(nproc) \
     && TEST_JOBS=$(nproc) make test_harness \

5.018.004-64bit,threaded/sha1.txt

@@ -8,11 +8,10 @@ RUN apt-get update \
 RUN mkdir /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 \
-    && 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 \
-    && rm perl-5.18.4.tar.bz2 /tmp/sha1.txt \
+    && rm perl-5.18.4.tar.bz2 \
     && ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
     && make -j$(nproc) \
     && TEST_JOBS=$(nproc) make test_harness \

5.018.004-64bit/Dockerfile

@@ -8,11 +8,10 @@ RUN apt-get update \
 RUN mkdir /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 \
-    && 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 \
-    && rm perl-5.20.1.tar.bz2 /tmp/sha1.txt \
+    && rm perl-5.20.1.tar.bz2 \
     && ./Configure -Dusethreads -Duse64bitall  -des \
     && make -j$(nproc) \
     && TEST_JOBS=$(nproc) make test_harness \

5.018.004-64bit/sha1.txt

@@ -8,11 +8,10 @@ RUN apt-get update \
 RUN mkdir /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 \
-    && 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 \
-    && rm perl-5.20.1.tar.bz2 /tmp/sha1.txt \
+    && rm perl-5.20.1.tar.bz2 \
     && ./Configure -Duse64bitall  -des \
     && make -j$(nproc) \
     && TEST_JOBS=$(nproc) make test_harness \

5.020.001-64bit,threaded/Dockerfile

@@ -49,17 +49,13 @@ sub die_with_sample {
 
   for my $config (keys %builds) {
     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;
 
     my $dir = sprintf "%i.%03i.%03i-%s",
                       ($release->{version} =~ /(\d+)\.(\d+)\.(\d+)/),
                       $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";
     print $dockerfile $output;
     close $dockerfile;
@@ -116,11 +112,10 @@ =head1 DESCRIPTION
 RUN mkdir /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 \
-    && 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 \
-    && rm perl-{{version}}.tar.bz2 /tmp/sha1.txt \
+    && rm perl-{{version}}.tar.bz2 \
     && ./Configure {{args}} {{extra_flags}} -des \
     && make -j$(nproc) \
     && TEST_JOBS=$(nproc) make test_harness \