Skip to content

Commit ac2324a

Browse files
tianonzakame
authored andcommitted
Adjust "cpm" install to use hard-coded path
This should fix "cpanm" being mistakenly removed 🙈 I also added some verification of both "cpanm" and "cpm" at least being invokable to help avoid this in the future.
1 parent 87a4b9d commit ac2324a

File tree

25 files changed

+125
-125
lines changed

25 files changed

+125
-125
lines changed

5.032.001-main,threaded-bullseye/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ RUN true \
2222
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \
2323
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
2424
&& cpanm IO::Socket::SSL \
25-
&& cd /usr/local/bin \
26-
&& curl -fLO https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm \
25+
&& curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \
2726
# sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299
28-
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 *cpm' | sha256sum --strict --check - \
29-
&& chmod +x cpm \
27+
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \
28+
&& chmod +x /usr/local/bin/cpm \
3029
&& true \
31-
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/*
30+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \
31+
&& cpanm --version && cpm --version
3232

3333
WORKDIR /
3434

5.032.001-main,threaded-buster/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ RUN true \
2222
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \
2323
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
2424
&& cpanm IO::Socket::SSL \
25-
&& cd /usr/local/bin \
26-
&& curl -fLO https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm \
25+
&& curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \
2726
# sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299
28-
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 *cpm' | sha256sum --strict --check - \
29-
&& chmod +x cpm \
27+
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \
28+
&& chmod +x /usr/local/bin/cpm \
3029
&& true \
31-
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/*
30+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \
31+
&& cpanm --version && cpm --version
3232

3333
WORKDIR /
3434

5.032.001-main-bullseye/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ RUN true \
2222
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \
2323
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
2424
&& cpanm IO::Socket::SSL \
25-
&& cd /usr/local/bin \
26-
&& curl -fLO https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm \
25+
&& curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \
2726
# sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299
28-
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 *cpm' | sha256sum --strict --check - \
29-
&& chmod +x cpm \
27+
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \
28+
&& chmod +x /usr/local/bin/cpm \
3029
&& true \
31-
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/*
30+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \
31+
&& cpanm --version && cpm --version
3232

3333
WORKDIR /
3434

5.032.001-main-buster/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ RUN true \
2222
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \
2323
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
2424
&& cpanm IO::Socket::SSL \
25-
&& cd /usr/local/bin \
26-
&& curl -fLO https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm \
25+
&& curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \
2726
# sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299
28-
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 *cpm' | sha256sum --strict --check - \
29-
&& chmod +x cpm \
27+
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \
28+
&& chmod +x /usr/local/bin/cpm \
3029
&& true \
31-
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/*
30+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \
31+
&& cpanm --version && cpm --version
3232

3333
WORKDIR /
3434

5.032.001-slim,threaded-bullseye/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ RUN apt-get update \
4343
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \
4444
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
4545
&& cpanm IO::Socket::SSL \
46-
&& cd /usr/local/bin \
47-
&& curl -fLO https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm \
46+
&& curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \
4847
# sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299
49-
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 *cpm' | sha256sum --strict --check - \
50-
&& chmod +x cpm \
48+
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \
49+
&& chmod +x /usr/local/bin/cpm \
5150
&& savedPackages="ca-certificates make netbase zlib1g-dev libssl-dev" \
5251
&& apt-mark auto '.*' > /dev/null \
5352
&& apt-mark manual $savedPackages \
5453
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
5554
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
56-
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/*
55+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \
56+
&& cpanm --version && cpm --version
5757

5858
WORKDIR /
5959

5.032.001-slim,threaded-buster/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ RUN apt-get update \
4343
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \
4444
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
4545
&& cpanm IO::Socket::SSL \
46-
&& cd /usr/local/bin \
47-
&& curl -fLO https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm \
46+
&& curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \
4847
# sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299
49-
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 *cpm' | sha256sum --strict --check - \
50-
&& chmod +x cpm \
48+
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \
49+
&& chmod +x /usr/local/bin/cpm \
5150
&& savedPackages="ca-certificates make netbase zlib1g-dev libssl-dev" \
5251
&& apt-mark auto '.*' > /dev/null \
5352
&& apt-mark manual $savedPackages \
5453
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
5554
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
56-
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/*
55+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \
56+
&& cpanm --version && cpm --version
5757

5858
WORKDIR /
5959

5.032.001-slim-bullseye/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ RUN apt-get update \
4343
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \
4444
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
4545
&& cpanm IO::Socket::SSL \
46-
&& cd /usr/local/bin \
47-
&& curl -fLO https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm \
46+
&& curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \
4847
# sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299
49-
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 *cpm' | sha256sum --strict --check - \
50-
&& chmod +x cpm \
48+
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \
49+
&& chmod +x /usr/local/bin/cpm \
5150
&& savedPackages="ca-certificates make netbase zlib1g-dev libssl-dev" \
5251
&& apt-mark auto '.*' > /dev/null \
5352
&& apt-mark manual $savedPackages \
5453
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
5554
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
56-
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/*
55+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \
56+
&& cpanm --version && cpm --version
5757

5858
WORKDIR /
5959

5.032.001-slim-buster/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ RUN apt-get update \
4343
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \
4444
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
4545
&& cpanm IO::Socket::SSL \
46-
&& cd /usr/local/bin \
47-
&& curl -fLO https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm \
46+
&& curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \
4847
# sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299
49-
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 *cpm' | sha256sum --strict --check - \
50-
&& chmod +x cpm \
48+
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \
49+
&& chmod +x /usr/local/bin/cpm \
5150
&& savedPackages="ca-certificates make netbase zlib1g-dev libssl-dev" \
5251
&& apt-mark auto '.*' > /dev/null \
5352
&& apt-mark manual $savedPackages \
5453
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
5554
&& rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
56-
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/*
55+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \
56+
&& cpanm --version && cpm --version
5757

5858
WORKDIR /
5959

5.034.001-main,threaded-bullseye/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ RUN true \
2222
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \
2323
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
2424
&& cpanm IO::Socket::SSL \
25-
&& cd /usr/local/bin \
26-
&& curl -fLO https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm \
25+
&& curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \
2726
# sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299
28-
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 *cpm' | sha256sum --strict --check - \
29-
&& chmod +x cpm \
27+
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \
28+
&& chmod +x /usr/local/bin/cpm \
3029
&& true \
31-
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/*
30+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \
31+
&& cpanm --version && cpm --version
3232

3333
WORKDIR /
3434

5.034.001-main,threaded-buster/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ RUN true \
2222
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum --strict --check - \
2323
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
2424
&& cpanm IO::Socket::SSL \
25-
&& cd /usr/local/bin \
26-
&& curl -fLO https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm \
25+
&& curl -fL https://raw.githubusercontent.com/skaji/cpm/0.997011/cpm -o /usr/local/bin/cpm \
2726
# sha256 checksum is from docker-perl team, cf https://github.com/docker-library/official-images/pull/12612#issuecomment-1158288299
28-
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 *cpm' | sha256sum --strict --check - \
29-
&& chmod +x cpm \
27+
&& echo '7dee2176a450a8be3a6b9b91dac603a0c3a7e807042626d3fe6c93d843f75610 */usr/local/bin/cpm' | sha256sum --strict --check - \
28+
&& chmod +x /usr/local/bin/cpm \
3029
&& true \
31-
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/*
30+
&& rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7046* /tmp/* \
31+
&& cpanm --version && cpm --version
3232

3333
WORKDIR /
3434

0 commit comments

Comments
 (0)