From 6678949c055b7db61a919cb98b7f908b7b353d13 Mon Sep 17 00:00:00 2001 From: Peter Martini Date: Fri, 3 Oct 2014 22:51:32 -0400 Subject: [PATCH] Use fewer steps, but othewise no change --- 5.018.004-64bit,threaded/Dockerfile | 15 ++++++++------- 5.018.004-64bit/Dockerfile | 15 +++++++-------- 5.020.001-64bit,threaded/Dockerfile | 15 ++++++++------- 5.020.001-64bit/Dockerfile | 15 ++++++++------- 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/5.018.004-64bit,threaded/Dockerfile b/5.018.004-64bit,threaded/Dockerfile index b359454..2e8d9fa 100644 --- a/5.018.004-64bit,threaded/Dockerfile +++ b/5.018.004-64bit,threaded/Dockerfile @@ -3,14 +3,15 @@ MAINTAINER Peter Martini RUN apt-get update && apt-get install -y curl procps -WORKDIR /tmp -ADD sha1.txt /tmp/sha1.txt -RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.18.4.tar.bz2 -o /tmp/perl-5.18.4.tar.bz2 -RUN sha1sum -c /tmp/sha1.txt - +RUN mkdir /usr/src/perl WORKDIR /usr/src/perl -RUN tar --strip-components=1 -xjf /tmp/perl-5.18.4.tar.bz2 -RUN rm /tmp/perl-5.18.4.tar.bz2 /tmp/sha1.txt + +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 \ + && 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 + # ccflags=-fwrapv is needed for gcc 4.9, and added by Configure automatically in 5.20+ RUN ./Configure -Dusethreads -A ccflags=-fwrapv -Duse64bitall -des \ && make -j$(nproc) \ diff --git a/5.018.004-64bit/Dockerfile b/5.018.004-64bit/Dockerfile index c7836b9..b0ce047 100644 --- a/5.018.004-64bit/Dockerfile +++ b/5.018.004-64bit/Dockerfile @@ -4,15 +4,14 @@ MAINTAINER Peter Martini RUN apt-get update && apt-get install -y curl procps RUN mkdir /usr/src/perl - -WORKDIR /tmp -ADD sha1.txt /tmp/sha1.txt -RUN curl -SL https://cpan.metacpan.org/authors/id/R/RJ/RJBS/perl-5.18.4.tar.bz2 -o /tmp/perl-5.18.4.tar.bz2 -RUN sha1sum -c /tmp/sha1.txt - WORKDIR /usr/src/perl -RUN tar --strip-components=1 -xjf /tmp/perl-5.18.4.tar.bz2 -RUN rm /tmp/perl-5.18.4.tar.bz2 /tmp/sha1.txt + +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 \ + && 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 + # ccflags=-fwrapv is needed for gcc 4.9, and added by Configure automatically in 5.20+ RUN ./Configure -Duse64bitall -A ccflags=-fwrapv -des \ && make -j$(nproc) \ diff --git a/5.020.001-64bit,threaded/Dockerfile b/5.020.001-64bit,threaded/Dockerfile index 6ebdd19..5b4a6b4 100644 --- a/5.020.001-64bit,threaded/Dockerfile +++ b/5.020.001-64bit,threaded/Dockerfile @@ -3,14 +3,15 @@ MAINTAINER Peter Martini RUN apt-get update && apt-get install -y curl procps -WORKDIR /tmp -ADD sha1.txt /tmp/sha1.txt -RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.1.tar.bz2 -o /tmp/perl-5.20.1.tar.bz2 -RUN sha1sum -c /tmp/sha1.txt - +RUN mkdir /usr/src/perl WORKDIR /usr/src/perl -RUN tar --strip-components=1 -xjf /tmp/perl-5.20.1.tar.bz2 -RUN rm /tmp/perl-5.20.1.tar.bz2 /tmp/sha1.txt + +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 \ + && 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 + RUN ./Configure -Dusethreads -Duse64bitall -des \ && make -j$(nproc) \ && TEST_JOBS=$(nproc) make test_harness \ diff --git a/5.020.001-64bit/Dockerfile b/5.020.001-64bit/Dockerfile index b9f0133..c2ae79a 100644 --- a/5.020.001-64bit/Dockerfile +++ b/5.020.001-64bit/Dockerfile @@ -3,14 +3,15 @@ MAINTAINER Peter Martini RUN apt-get update && apt-get install -y curl procps -WORKDIR /tmp -ADD sha1.txt /tmp/sha1.txt -RUN curl -SL https://cpan.metacpan.org/authors/id/S/SH/SHAY/perl-5.20.1.tar.bz2 -o /tmp/perl-5.20.1.tar.bz2 -RUN sha1sum -c /tmp/sha1.txt - +RUN mkdir /usr/src/perl WORKDIR /usr/src/perl -RUN tar --strip-components=1 -xjf /tmp/perl-5.20.1.tar.bz2 -RUN rm /tmp/perl-5.20.1.tar.bz2 /tmp/sha1.txt + +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 \ + && 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 + RUN ./Configure -Duse64bitall -des \ && make -j$(nproc) \ && TEST_JOBS=$(nproc) make test_harness \