Skip to content

Commit 6678949

Browse files
committed
Use fewer steps, but othewise no change
1 parent 0d0b0c8 commit 6678949

File tree

4 files changed

+30
-28
lines changed

4 files changed

+30
-28
lines changed

5.018.004-64bit,threaded/Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ MAINTAINER Peter Martini <[email protected]>
33

44
RUN apt-get update && apt-get install -y curl procps
55

6-
WORKDIR /tmp
7-
ADD sha1.txt /tmp/sha1.txt
8-
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
9-
RUN sha1sum -c /tmp/sha1.txt
10-
6+
RUN mkdir /usr/src/perl
117
WORKDIR /usr/src/perl
12-
RUN tar --strip-components=1 -xjf /tmp/perl-5.18.4.tar.bz2
13-
RUN rm /tmp/perl-5.18.4.tar.bz2 /tmp/sha1.txt
8+
9+
COPY sha1.txt /tmp/sha1.txt
10+
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 \
11+
&& sha1sum -c /tmp/sha1.txt \
12+
&& tar --strip-components=1 -xjf perl-5.18.4.tar.bz2 -C /usr/src/perl \
13+
&& rm perl-5.18.4.tar.bz2 /tmp/sha1.txt
14+
1415
# ccflags=-fwrapv is needed for gcc 4.9, and added by Configure automatically in 5.20+
1516
RUN ./Configure -Dusethreads -A ccflags=-fwrapv -Duse64bitall -des \
1617
&& make -j$(nproc) \

5.018.004-64bit/Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ MAINTAINER Peter Martini <[email protected]>
44
RUN apt-get update && apt-get install -y curl procps
55

66
RUN mkdir /usr/src/perl
7+
WORKDIR /usr/src/perl
78

8-
WORKDIR /tmp
9-
ADD sha1.txt /tmp/sha1.txt
10-
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
11-
RUN sha1sum -c /tmp/sha1.txt
9+
COPY sha1.txt /tmp/sha1.txt
10+
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 \
11+
&& sha1sum -c /tmp/sha1.txt \
12+
&& tar --strip-components=1 -xjf perl-5.18.4.tar.bz2 -C /usr/src/perl \
13+
&& rm perl-5.18.4.tar.bz2 /tmp/sha1.txt
1214

13-
WORKDIR /usr/src/perl
14-
RUN tar --strip-components=1 -xjf /tmp/perl-5.18.4.tar.bz2
15-
RUN rm /tmp/perl-5.18.4.tar.bz2 /tmp/sha1.txt
1615
# ccflags=-fwrapv is needed for gcc 4.9, and added by Configure automatically in 5.20+
1716
RUN ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
1817
&& make -j$(nproc) \

5.020.001-64bit,threaded/Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ MAINTAINER Peter Martini <[email protected]>
33

44
RUN apt-get update && apt-get install -y curl procps
55

6-
WORKDIR /tmp
7-
ADD sha1.txt /tmp/sha1.txt
8-
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
9-
RUN sha1sum -c /tmp/sha1.txt
10-
6+
RUN mkdir /usr/src/perl
117
WORKDIR /usr/src/perl
12-
RUN tar --strip-components=1 -xjf /tmp/perl-5.20.1.tar.bz2
13-
RUN rm /tmp/perl-5.20.1.tar.bz2 /tmp/sha1.txt
8+
9+
COPY sha1.txt /tmp/sha1.txt
10+
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 \
11+
&& sha1sum -c /tmp/sha1.txt \
12+
&& tar --strip-components=1 -xjf perl-5.20.1.tar.bz2 -C /usr/src/perl \
13+
&& rm perl-5.20.1.tar.bz2 /tmp/sha1.txt
14+
1415
RUN ./Configure -Dusethreads -Duse64bitall -des \
1516
&& make -j$(nproc) \
1617
&& TEST_JOBS=$(nproc) make test_harness \

5.020.001-64bit/Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ MAINTAINER Peter Martini <[email protected]>
33

44
RUN apt-get update && apt-get install -y curl procps
55

6-
WORKDIR /tmp
7-
ADD sha1.txt /tmp/sha1.txt
8-
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
9-
RUN sha1sum -c /tmp/sha1.txt
10-
6+
RUN mkdir /usr/src/perl
117
WORKDIR /usr/src/perl
12-
RUN tar --strip-components=1 -xjf /tmp/perl-5.20.1.tar.bz2
13-
RUN rm /tmp/perl-5.20.1.tar.bz2 /tmp/sha1.txt
8+
9+
COPY sha1.txt /tmp/sha1.txt
10+
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 \
11+
&& sha1sum -c /tmp/sha1.txt \
12+
&& tar --strip-components=1 -xjf perl-5.20.1.tar.bz2 -C /usr/src/perl \
13+
&& rm perl-5.20.1.tar.bz2 /tmp/sha1.txt
14+
1415
RUN ./Configure -Duse64bitall -des \
1516
&& make -j$(nproc) \
1617
&& TEST_JOBS=$(nproc) make test_harness \

0 commit comments

Comments
 (0)