Skip to content

Commit 26d7731

Browse files
thresheekthresheek
committed
Use https to fetch nginx packages.
1 parent cc3dd18 commit 26d7731

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎mainline/stretch-perl/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV NJS_VERSION 1.13.8.0.1.15-1~stretch
77

88
RUN set -x \
99
&& apt-get update \
10-
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 \
10+
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 apt-transport-https ca-certificates \
1111
&& \
1212
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
1313
found=''; \
@@ -34,13 +34,13 @@ RUN set -x \
3434
&& case "$dpkgArch" in \
3535
amd64|i386) \
3636
# arches officialy built by upstream
37-
echo "deb http://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list \
37+
echo "deb https://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list.d/nginx.list \
3838
&& apt-get update \
3939
;; \
4040
*) \
4141
# we're on an architecture upstream doesn't officially build for
4242
# let's build binaries from the published source packages
43-
echo "deb-src http://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list \
43+
echo "deb-src https://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list/nginx.list \
4444
\
4545
# new directory for storing sources and .deb files
4646
&& tempDir="$(mktemp -d)" \
@@ -81,7 +81,7 @@ RUN set -x \
8181
&& apt-get install --no-install-recommends --no-install-suggests -y \
8282
$nginxPackages \
8383
gettext-base \
84-
&& rm -rf /var/lib/apt/lists/* \
84+
&& apt-get remove --purge --auto-remove -y apt-transport-https ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list/nginx.list \
8585
\
8686
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
8787
&& if [ -n "$tempDir" ]; then \

‎mainline/stretch/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV NJS_VERSION 1.13.8.0.1.15-1~stretch
77

88
RUN set -x \
99
&& apt-get update \
10-
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 \
10+
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 apt-transport-https ca-certificates \
1111
&& \
1212
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
1313
found=''; \
@@ -33,13 +33,13 @@ RUN set -x \
3333
&& case "$dpkgArch" in \
3434
amd64|i386) \
3535
# arches officialy built by upstream
36-
echo "deb http://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list \
36+
echo "deb https://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list.d/nginx.list \
3737
&& apt-get update \
3838
;; \
3939
*) \
4040
# we're on an architecture upstream doesn't officially build for
4141
# let's build binaries from the published source packages
42-
echo "deb-src http://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list \
42+
echo "deb-src https://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list/nginx.list \
4343
\
4444
# new directory for storing sources and .deb files
4545
&& tempDir="$(mktemp -d)" \
@@ -80,7 +80,7 @@ RUN set -x \
8080
&& apt-get install --no-install-recommends --no-install-suggests -y \
8181
$nginxPackages \
8282
gettext-base \
83-
&& rm -rf /var/lib/apt/lists/* \
83+
&& apt-get remove --purge --auto-remove -y apt-transport-https ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list/nginx.list \
8484
\
8585
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
8686
&& if [ -n "$tempDir" ]; then \

‎stable/stretch-perl/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV NJS_VERSION 1.12.2.0.1.14-1~stretch
77

88
RUN set -x \
99
&& apt-get update \
10-
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 \
10+
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 apt-transport-https ca-certificates \
1111
&& \
1212
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
1313
found=''; \
@@ -34,13 +34,13 @@ RUN set -x \
3434
&& case "$dpkgArch" in \
3535
amd64|i386) \
3636
# arches officialy built by upstream
37-
echo "deb http://nginx.org/packages/debian/ stretch nginx" >> /etc/apt/sources.list \
37+
echo "deb https://nginx.org/packages/debian/ stretch nginx" >> /etc/apt/sources.list.d/nginx.list \
3838
&& apt-get update \
3939
;; \
4040
*) \
4141
# we're on an architecture upstream doesn't officially build for
4242
# let's build binaries from the published source packages
43-
echo "deb-src http://nginx.org/packages/debian/ stretch nginx" >> /etc/apt/sources.list \
43+
echo "deb-src https://nginx.org/packages/debian/ stretch nginx" >> /etc/apt/sources.list.d/nginx.list \
4444
\
4545
# new directory for storing sources and .deb files
4646
&& tempDir="$(mktemp -d)" \
@@ -81,7 +81,7 @@ RUN set -x \
8181
&& apt-get install --no-install-recommends --no-install-suggests -y \
8282
$nginxPackages \
8383
gettext-base \
84-
&& rm -rf /var/lib/apt/lists/* \
84+
&& apt-get remove --purge --auto-remove -y apt-transport-https ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
8585
\
8686
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
8787
&& if [ -n "$tempDir" ]; then \

‎stable/stretch/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV NJS_VERSION 1.12.2.0.1.14-1~stretch
77

88
RUN set -x \
99
&& apt-get update \
10-
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 \
10+
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 apt-transport-https ca-certificates \
1111
&& \
1212
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
1313
found=''; \
@@ -33,13 +33,13 @@ RUN set -x \
3333
&& case "$dpkgArch" in \
3434
amd64|i386) \
3535
# arches officialy built by upstream
36-
echo "deb http://nginx.org/packages/debian/ stretch nginx" >> /etc/apt/sources.list \
36+
echo "deb https://nginx.org/packages/debian/ stretch nginx" >> /etc/apt/sources.list.d/nginx.list \
3737
&& apt-get update \
3838
;; \
3939
*) \
4040
# we're on an architecture upstream doesn't officially build for
4141
# let's build binaries from the published source packages
42-
echo "deb-src http://nginx.org/packages/debian/ stretch nginx" >> /etc/apt/sources.list \
42+
echo "deb-src https://nginx.org/packages/debian/ stretch nginx" >> /etc/apt/sources.list.d/nginx.list \
4343
\
4444
# new directory for storing sources and .deb files
4545
&& tempDir="$(mktemp -d)" \
@@ -80,7 +80,7 @@ RUN set -x \
8080
&& apt-get install --no-install-recommends --no-install-suggests -y \
8181
$nginxPackages \
8282
gettext-base \
83-
&& rm -rf /var/lib/apt/lists/* \
83+
&& apt-get remove --purge --auto-remove -y apt-transport-https ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
8484
\
8585
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
8686
&& if [ -n "$tempDir" ]; then \

0 commit comments

Comments
 (0)