Skip to content

Commit 9e28e52

Browse files
authored
Revert "Configure cpanm to install over HTTPS" (#117)
* Revert ".github/workflows/build-image.yml: add cpanm install test" This reverts commit a2d4582. * Revert ":gear: Regenerate Dockerfiles" This reverts commit 6dc0393. * Revert "generate.pl: Configure cpanm to install over HTTPS" This reverts commit 31ecb98.
1 parent a2d4582 commit 9e28e52

File tree

26 files changed

+14
-69
lines changed

26 files changed

+14
-69
lines changed

.github/workflows/build-image.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,8 @@ jobs:
4848
img="perl:${dir//,/-}"
4949
docker image inspect --format '{{.Created}}' "$img"
5050
docker image inspect --format '{{.Metadata.LastTagTime}}' "$img"
51-
- name: Run tests from docker-library/official-images
51+
- name: Run tests
5252
run: |
5353
dir='${{ matrix.directory }}'
5454
img="perl:${dir//,/-}"
5555
./official-images/test/run.sh "$img"
56-
- name: Run cpanm install test
57-
run: |
58-
dir='${{ matrix.directory }}'
59-
img="perl:${dir//,/-}"
60-
docker run "$img" cpanm -v Mojolicious

5.032.001-main,threaded-bullseye/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@c
44
COPY *.patch /usr/src/perl/
55
WORKDIR /usr/src/perl
66

7-
ENV PERL_CPANM_OPT="--from https://www.cpan.org"
8-
97
RUN true \
108
&& curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
119
&& echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \

5.032.001-main,threaded-buster/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@c
44
COPY *.patch /usr/src/perl/
55
WORKDIR /usr/src/perl
66

7-
ENV PERL_CPANM_OPT="--from https://www.cpan.org"
8-
97
RUN true \
108
&& curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
119
&& echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \

5.032.001-main-bullseye/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@c
44
COPY *.patch /usr/src/perl/
55
WORKDIR /usr/src/perl
66

7-
ENV PERL_CPANM_OPT="--from https://www.cpan.org"
8-
97
RUN true \
108
&& curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
119
&& echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \

5.032.001-main-buster/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@c
44
COPY *.patch /usr/src/perl/
55
WORKDIR /usr/src/perl
66

7-
ENV PERL_CPANM_OPT="--from https://www.cpan.org"
8-
97
RUN true \
108
&& curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
119
&& echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \

5.032.001-slim,threaded-bullseye/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@c
44
COPY *.patch /usr/src/perl/
55
WORKDIR /usr/src/perl
66

7-
ENV PERL_CPANM_OPT="--from https://www.cpan.org"
8-
97
RUN apt-get update \
108
&& apt-get install -y --no-install-recommends \
119
bzip2 \
@@ -43,7 +41,7 @@ RUN apt-get update \
4341
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \
4442
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum -c - \
4543
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
46-
&& savedPackages="ca-certificates curl make netbase" \
44+
&& savedPackages="make netbase" \
4745
&& apt-mark auto '.*' > /dev/null \
4846
&& apt-mark manual $savedPackages \
4947
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \

5.032.001-slim,threaded-buster/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@c
44
COPY *.patch /usr/src/perl/
55
WORKDIR /usr/src/perl
66

7-
ENV PERL_CPANM_OPT="--from https://www.cpan.org"
8-
97
RUN apt-get update \
108
&& apt-get install -y --no-install-recommends \
119
bzip2 \
@@ -43,7 +41,7 @@ RUN apt-get update \
4341
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \
4442
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum -c - \
4543
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
46-
&& savedPackages="ca-certificates curl make netbase" \
44+
&& savedPackages="make netbase" \
4745
&& apt-mark auto '.*' > /dev/null \
4846
&& apt-mark manual $savedPackages \
4947
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \

5.032.001-slim-bullseye/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@c
44
COPY *.patch /usr/src/perl/
55
WORKDIR /usr/src/perl
66

7-
ENV PERL_CPANM_OPT="--from https://www.cpan.org"
8-
97
RUN apt-get update \
108
&& apt-get install -y --no-install-recommends \
119
bzip2 \
@@ -43,7 +41,7 @@ RUN apt-get update \
4341
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \
4442
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum -c - \
4543
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
46-
&& savedPackages="ca-certificates curl make netbase" \
44+
&& savedPackages="make netbase" \
4745
&& apt-mark auto '.*' > /dev/null \
4846
&& apt-mark manual $savedPackages \
4947
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \

5.032.001-slim-buster/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@c
44
COPY *.patch /usr/src/perl/
55
WORKDIR /usr/src/perl
66

7-
ENV PERL_CPANM_OPT="--from https://www.cpan.org"
8-
97
RUN apt-get update \
108
&& apt-get install -y --no-install-recommends \
119
bzip2 \
@@ -43,7 +41,7 @@ RUN apt-get update \
4341
&& curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7046.tar.gz \
4442
&& echo '3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 *App-cpanminus-1.7046.tar.gz' | sha256sum -c - \
4543
&& tar -xzf App-cpanminus-1.7046.tar.gz && cd App-cpanminus-1.7046 && perl bin/cpanm . && cd /root \
46-
&& savedPackages="ca-certificates curl make netbase" \
44+
&& savedPackages="make netbase" \
4745
&& apt-mark auto '.*' > /dev/null \
4846
&& apt-mark manual $savedPackages \
4947
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \

5.034.001-main,threaded-bullseye/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@c
44
COPY *.patch /usr/src/perl/
55
WORKDIR /usr/src/perl
66

7-
ENV PERL_CPANM_OPT="--from https://www.cpan.org"
8-
97
RUN true \
108
&& curl -SL https://www.cpan.org/src/5.0/perl-5.34.1.tar.xz -o perl-5.34.1.tar.xz \
119
&& echo '6d52cf833ff1af27bb5e986870a2c30cec73c044b41e3458cd991f94374039f7 *perl-5.34.1.tar.xz' | sha256sum -c - \

0 commit comments

Comments
 (0)