Skip to content

Commit 441533a

Browse files
tianontianon
authored
Merge pull request docker-library#749 from infosiftr/alpine-fetch-deps
Remove (no longer necessary) Alpine fetch-deps
2 parents 9586595 + 1d14037 commit 441533a

File tree

7 files changed

+7
-42
lines changed

7 files changed

+7
-42
lines changed

‎10/alpine/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ ENV PG_SHA256 4d701f450cd92ffb123cf6c296e9656abbc2ab7ea6507894ff1e2475ae0754e1
2323

2424
RUN set -ex \
2525
\
26-
&& apk add --no-cache --virtual .fetch-deps \
27-
ca-certificates \
28-
openssl \
29-
tar \
30-
\
3126
&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
3227
&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
3328
&& mkdir -p /usr/src/postgresql \
@@ -124,7 +119,7 @@ RUN set -ex \
124119
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
125120
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
126121
tzdata \
127-
&& apk del .fetch-deps .build-deps \
122+
&& apk del --no-network .build-deps \
128123
&& cd / \
129124
&& rm -rf \
130125
/usr/src/postgresql \

‎11/alpine/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ ENV PG_SHA256 eaf2f4329ccc349c89e950761b81daf8c99bb8966abcab5665ccd6ee95c77ae2
2323

2424
RUN set -ex \
2525
\
26-
&& apk add --no-cache --virtual .fetch-deps \
27-
ca-certificates \
28-
openssl \
29-
tar \
30-
\
3126
&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
3227
&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
3328
&& mkdir -p /usr/src/postgresql \
@@ -126,7 +121,7 @@ RUN set -ex \
126121
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
127122
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
128123
tzdata \
129-
&& apk del .fetch-deps .build-deps \
124+
&& apk del --no-network .build-deps \
130125
&& cd / \
131126
&& rm -rf \
132127
/usr/src/postgresql \

‎12/alpine/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ ENV PG_SHA256 94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41
2323

2424
RUN set -ex \
2525
\
26-
&& apk add --no-cache --virtual .fetch-deps \
27-
ca-certificates \
28-
openssl \
29-
tar \
30-
\
3126
&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
3227
&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
3328
&& mkdir -p /usr/src/postgresql \
@@ -126,7 +121,7 @@ RUN set -ex \
126121
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
127122
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
128123
tzdata \
129-
&& apk del .fetch-deps .build-deps \
124+
&& apk del --no-network .build-deps \
130125
&& cd / \
131126
&& rm -rf \
132127
/usr/src/postgresql \

‎13/alpine/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ ENV PG_SHA256 249ba0d0227d5393b83d397f2543354bfee579276cb1e821e9b7d904a42039e1
2323

2424
RUN set -ex \
2525
\
26-
&& apk add --no-cache --virtual .fetch-deps \
27-
ca-certificates \
28-
openssl \
29-
tar \
30-
\
3126
&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
3227
&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
3328
&& mkdir -p /usr/src/postgresql \
@@ -126,7 +121,7 @@ RUN set -ex \
126121
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
127122
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
128123
tzdata \
129-
&& apk del .fetch-deps .build-deps \
124+
&& apk del --no-network .build-deps \
130125
&& cd / \
131126
&& rm -rf \
132127
/usr/src/postgresql \

‎9.5/alpine/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ ENV PG_SHA256 48555470a17248cb204d25ab1ad4231ef16295db55161922f006b9942d69640f
2323

2424
RUN set -ex \
2525
\
26-
&& apk add --no-cache --virtual .fetch-deps \
27-
ca-certificates \
28-
openssl \
29-
tar \
30-
\
3126
&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
3227
&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
3328
&& mkdir -p /usr/src/postgresql \
@@ -122,7 +117,7 @@ RUN set -ex \
122117
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
123118
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
124119
tzdata \
125-
&& apk del .fetch-deps .build-deps \
120+
&& apk del --no-network .build-deps \
126121
&& cd / \
127122
&& rm -rf \
128123
/usr/src/postgresql \

‎9.6/alpine/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ ENV PG_SHA256 517ec282b785e6d22f360c30ba0c5e2a506fca5ca07dcc545427511d94c89999
2323

2424
RUN set -ex \
2525
\
26-
&& apk add --no-cache --virtual .fetch-deps \
27-
ca-certificates \
28-
openssl \
29-
tar \
30-
\
3126
&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
3227
&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
3328
&& mkdir -p /usr/src/postgresql \
@@ -122,7 +117,7 @@ RUN set -ex \
122117
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
123118
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
124119
tzdata \
125-
&& apk del .fetch-deps .build-deps \
120+
&& apk del --no-network .build-deps \
126121
&& cd / \
127122
&& rm -rf \
128123
/usr/src/postgresql \

‎Dockerfile-alpine.template

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ ENV PG_SHA256 %%PG_SHA256%%
2323

2424
RUN set -ex \
2525
\
26-
&& apk add --no-cache --virtual .fetch-deps \
27-
ca-certificates \
28-
openssl \
29-
tar \
30-
\
3126
&& wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2" \
3227
&& echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c - \
3328
&& mkdir -p /usr/src/postgresql \
@@ -126,7 +121,7 @@ RUN set -ex \
126121
# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
127122
# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
128123
tzdata \
129-
&& apk del .fetch-deps .build-deps \
124+
&& apk del --no-network .build-deps \
130125
&& cd / \
131126
&& rm -rf \
132127
/usr/src/postgresql \

0 commit comments

Comments
 (0)