Skip to content

Commit 322a05e

Browse files
committed
Merge pull request #8 from frioux/patch-1
Do more at once to make image smaller
2 parents c7af0df + e1dda05 commit 322a05e

File tree

5 files changed

+65
-75
lines changed

5 files changed

+65
-75
lines changed

5.018.004-64bit,threaded/Dockerfile

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM buildpack-deps
22
MAINTAINER Peter Martini <[email protected]>
33

4-
RUN apt-get update && apt-get install -y curl procps
4+
RUN apt-get update \
5+
&& apt-get install -y curl procps \
6+
&& rm -fr /var/lib/apt/lists/*
57

68
RUN mkdir /usr/src/perl
79
WORKDIR /usr/src/perl
@@ -10,20 +12,16 @@ COPY sha1.txt /tmp/sha1.txt
1012
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 \
1113
&& sha1sum -c /tmp/sha1.txt \
1214
&& 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-
15-
RUN ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
16-
&& make -j$(nproc) \
17-
&& TEST_JOBS=$(nproc) make test_harness \
18-
&& make install \
19-
&& make veryclean
20-
21-
WORKDIR /usr/src
22-
RUN curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
23-
&& chmod +x cpanm \
24-
&& ./cpanm App::cpanminus \
25-
&& rm -fr /root/.cpanm \
26-
&& rm ./cpanm
15+
&& rm perl-5.18.4.tar.bz2 /tmp/sha1.txt \
16+
&& ./Configure -Dusethreads -Duse64bitall -A ccflags=-fwrapv -des \
17+
&& make -j$(nproc) \
18+
&& TEST_JOBS=$(nproc) make test_harness \
19+
&& make install \
20+
&& cd /usr/src \
21+
&& curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
22+
&& chmod +x cpanm \
23+
&& ./cpanm App::cpanminus \
24+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl
2725

2826
WORKDIR /root
2927

5.018.004-64bit/Dockerfile

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM buildpack-deps
22
MAINTAINER Peter Martini <[email protected]>
33

4-
RUN apt-get update && apt-get install -y curl procps
4+
RUN apt-get update \
5+
&& apt-get install -y curl procps \
6+
&& rm -fr /var/lib/apt/lists/*
57

68
RUN mkdir /usr/src/perl
79
WORKDIR /usr/src/perl
@@ -10,20 +12,16 @@ COPY sha1.txt /tmp/sha1.txt
1012
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 \
1113
&& sha1sum -c /tmp/sha1.txt \
1214
&& 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-
15-
RUN ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
16-
&& make -j$(nproc) \
17-
&& TEST_JOBS=$(nproc) make test_harness \
18-
&& make install \
19-
&& make veryclean
20-
21-
WORKDIR /usr/src
22-
RUN curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
23-
&& chmod +x cpanm \
24-
&& ./cpanm App::cpanminus \
25-
&& rm -fr /root/.cpanm \
26-
&& rm ./cpanm
15+
&& rm perl-5.18.4.tar.bz2 /tmp/sha1.txt \
16+
&& ./Configure -Duse64bitall -A ccflags=-fwrapv -des \
17+
&& make -j$(nproc) \
18+
&& TEST_JOBS=$(nproc) make test_harness \
19+
&& make install \
20+
&& cd /usr/src \
21+
&& curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
22+
&& chmod +x cpanm \
23+
&& ./cpanm App::cpanminus \
24+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl
2725

2826
WORKDIR /root
2927

5.020.001-64bit,threaded/Dockerfile

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM buildpack-deps
22
MAINTAINER Peter Martini <[email protected]>
33

4-
RUN apt-get update && apt-get install -y curl procps
4+
RUN apt-get update \
5+
&& apt-get install -y curl procps \
6+
&& rm -fr /var/lib/apt/lists/*
57

68
RUN mkdir /usr/src/perl
79
WORKDIR /usr/src/perl
@@ -10,20 +12,16 @@ COPY sha1.txt /tmp/sha1.txt
1012
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 \
1113
&& sha1sum -c /tmp/sha1.txt \
1214
&& 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-
15-
RUN ./Configure -Dusethreads -Duse64bitall -des \
16-
&& make -j$(nproc) \
17-
&& TEST_JOBS=$(nproc) make test_harness \
18-
&& make install \
19-
&& make veryclean
20-
21-
WORKDIR /usr/src
22-
RUN curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
23-
&& chmod +x cpanm \
24-
&& ./cpanm App::cpanminus \
25-
&& rm -fr /root/.cpanm \
26-
&& rm ./cpanm
15+
&& rm perl-5.20.1.tar.bz2 /tmp/sha1.txt \
16+
&& ./Configure -Dusethreads -Duse64bitall -des \
17+
&& make -j$(nproc) \
18+
&& TEST_JOBS=$(nproc) make test_harness \
19+
&& make install \
20+
&& cd /usr/src \
21+
&& curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
22+
&& chmod +x cpanm \
23+
&& ./cpanm App::cpanminus \
24+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl
2725

2826
WORKDIR /root
2927

5.020.001-64bit/Dockerfile

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM buildpack-deps
22
MAINTAINER Peter Martini <[email protected]>
33

4-
RUN apt-get update && apt-get install -y curl procps
4+
RUN apt-get update \
5+
&& apt-get install -y curl procps \
6+
&& rm -fr /var/lib/apt/lists/*
57

68
RUN mkdir /usr/src/perl
79
WORKDIR /usr/src/perl
@@ -10,20 +12,16 @@ COPY sha1.txt /tmp/sha1.txt
1012
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 \
1113
&& sha1sum -c /tmp/sha1.txt \
1214
&& 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-
15-
RUN ./Configure -Duse64bitall -des \
16-
&& make -j$(nproc) \
17-
&& TEST_JOBS=$(nproc) make test_harness \
18-
&& make install \
19-
&& make veryclean
20-
21-
WORKDIR /usr/src
22-
RUN curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
23-
&& chmod +x cpanm \
24-
&& ./cpanm App::cpanminus \
25-
&& rm -fr /root/.cpanm \
26-
&& rm ./cpanm
15+
&& rm perl-5.20.1.tar.bz2 /tmp/sha1.txt \
16+
&& ./Configure -Duse64bitall -des \
17+
&& make -j$(nproc) \
18+
&& TEST_JOBS=$(nproc) make test_harness \
19+
&& make install \
20+
&& cd /usr/src \
21+
&& curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
22+
&& chmod +x cpanm \
23+
&& ./cpanm App::cpanminus \
24+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl
2725

2826
WORKDIR /root
2927

generate.pl

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ =head1 DESCRIPTION
109109
FROM buildpack-deps
110110
MAINTAINER Peter Martini <[email protected]>
111111
112-
RUN apt-get update && apt-get install -y curl procps
112+
RUN apt-get update \
113+
&& apt-get install -y curl procps \
114+
&& rm -fr /var/lib/apt/lists/*
113115
114116
RUN mkdir /usr/src/perl
115117
WORKDIR /usr/src/perl
@@ -118,20 +120,16 @@ =head1 DESCRIPTION
118120
RUN curl -SL https://cpan.metacpan.org/authors/id/{{pause}}/perl-{{version}}.tar.bz2 -o perl-{{version}}.tar.bz2 \
119121
&& sha1sum -c /tmp/sha1.txt \
120122
&& tar --strip-components=1 -xjf perl-{{version}}.tar.bz2 -C /usr/src/perl \
121-
&& rm perl-{{version}}.tar.bz2 /tmp/sha1.txt
122-
123-
RUN ./Configure {{args}} {{extra_flags}} -des \
124-
&& make -j$(nproc) \
125-
&& TEST_JOBS=$(nproc) make test_harness \
126-
&& make install \
127-
&& make veryclean
128-
129-
WORKDIR /usr/src
130-
RUN curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
131-
&& chmod +x cpanm \
132-
&& ./cpanm App::cpanminus \
133-
&& rm -fr /root/.cpanm \
134-
&& rm ./cpanm
123+
&& rm perl-{{version}}.tar.bz2 /tmp/sha1.txt \
124+
&& ./Configure {{args}} {{extra_flags}} -des \
125+
&& make -j$(nproc) \
126+
&& TEST_JOBS=$(nproc) make test_harness \
127+
&& make install \
128+
&& cd /usr/src \
129+
&& curl -LO https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm \
130+
&& chmod +x cpanm \
131+
&& ./cpanm App::cpanminus \
132+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl
135133
136134
WORKDIR /root
137135

0 commit comments

Comments
 (0)