Skip to content

Commit 2bfff51

Browse files
tianontianon
authored
Merge pull request docker-library#323 from infosiftr/purge-xz-utils
Move APT lists purging to ensure all packages get purged properly
2 parents 663b4a6 + 8350b86 commit 2bfff51

File tree

11 files changed

+22
-22
lines changed

11 files changed

+22
-22
lines changed

‎2.7/jessie/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RUN set -ex \
4545
zlib1g-dev \
4646
# as of Stretch, "gpg" is no longer included by default
4747
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
48-
&& rm -rf /var/lib/apt/lists/* \
4948
\
5049
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
5150
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
@@ -78,6 +77,7 @@ RUN set -ex \
7877
| sort -u \
7978
| xargs -r apt-mark manual \
8079
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
80+
&& rm -rf /var/lib/apt/lists/* \
8181
\
8282
&& find /usr/local -depth \
8383
\( \
@@ -97,13 +97,13 @@ RUN set -ex; \
9797
savedAptMark="$(apt-mark showmanual)"; \
9898
apt-get update; \
9999
apt-get install -y --no-install-recommends wget; \
100-
rm -rf /var/lib/apt/lists/*; \
101100
\
102101
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
103102
\
104103
apt-mark auto '.*' > /dev/null; \
105104
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
106105
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
106+
rm -rf /var/lib/apt/lists/*; \
107107
\
108108
python get-pip.py \
109109
--disable-pip-version-check \

‎2.7/stretch/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RUN set -ex \
4545
zlib1g-dev \
4646
# as of Stretch, "gpg" is no longer included by default
4747
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
48-
&& rm -rf /var/lib/apt/lists/* \
4948
\
5049
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
5150
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
@@ -78,6 +77,7 @@ RUN set -ex \
7877
| sort -u \
7978
| xargs -r apt-mark manual \
8079
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
80+
&& rm -rf /var/lib/apt/lists/* \
8181
\
8282
&& find /usr/local -depth \
8383
\( \
@@ -97,13 +97,13 @@ RUN set -ex; \
9797
savedAptMark="$(apt-mark showmanual)"; \
9898
apt-get update; \
9999
apt-get install -y --no-install-recommends wget; \
100-
rm -rf /var/lib/apt/lists/*; \
101100
\
102101
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
103102
\
104103
apt-mark auto '.*' > /dev/null; \
105104
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
106105
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
106+
rm -rf /var/lib/apt/lists/*; \
107107
\
108108
python get-pip.py \
109109
--disable-pip-version-check \

‎3.4/jessie/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RUN set -ex \
4545
zlib1g-dev \
4646
# as of Stretch, "gpg" is no longer included by default
4747
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
48-
&& rm -rf /var/lib/apt/lists/* \
4948
\
5049
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
5150
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
@@ -81,6 +80,7 @@ RUN set -ex \
8180
| sort -u \
8281
| xargs -r apt-mark manual \
8382
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
83+
&& rm -rf /var/lib/apt/lists/* \
8484
\
8585
&& find /usr/local -depth \
8686
\( \
@@ -107,13 +107,13 @@ RUN set -ex; \
107107
savedAptMark="$(apt-mark showmanual)"; \
108108
apt-get update; \
109109
apt-get install -y --no-install-recommends wget; \
110-
rm -rf /var/lib/apt/lists/*; \
111110
\
112111
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
113112
\
114113
apt-mark auto '.*' > /dev/null; \
115114
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
116115
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
116+
rm -rf /var/lib/apt/lists/*; \
117117
\
118118
python get-pip.py \
119119
--disable-pip-version-check \

‎3.4/stretch/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RUN set -ex \
4545
zlib1g-dev \
4646
# as of Stretch, "gpg" is no longer included by default
4747
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
48-
&& rm -rf /var/lib/apt/lists/* \
4948
\
5049
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
5150
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
@@ -81,6 +80,7 @@ RUN set -ex \
8180
| sort -u \
8281
| xargs -r apt-mark manual \
8382
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
83+
&& rm -rf /var/lib/apt/lists/* \
8484
\
8585
&& find /usr/local -depth \
8686
\( \
@@ -107,13 +107,13 @@ RUN set -ex; \
107107
savedAptMark="$(apt-mark showmanual)"; \
108108
apt-get update; \
109109
apt-get install -y --no-install-recommends wget; \
110-
rm -rf /var/lib/apt/lists/*; \
111110
\
112111
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
113112
\
114113
apt-mark auto '.*' > /dev/null; \
115114
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
116115
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
116+
rm -rf /var/lib/apt/lists/*; \
117117
\
118118
python get-pip.py \
119119
--disable-pip-version-check \

‎3.5/jessie/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RUN set -ex \
4545
zlib1g-dev \
4646
# as of Stretch, "gpg" is no longer included by default
4747
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
48-
&& rm -rf /var/lib/apt/lists/* \
4948
\
5049
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
5150
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
@@ -81,6 +80,7 @@ RUN set -ex \
8180
| sort -u \
8281
| xargs -r apt-mark manual \
8382
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
83+
&& rm -rf /var/lib/apt/lists/* \
8484
\
8585
&& find /usr/local -depth \
8686
\( \
@@ -107,13 +107,13 @@ RUN set -ex; \
107107
savedAptMark="$(apt-mark showmanual)"; \
108108
apt-get update; \
109109
apt-get install -y --no-install-recommends wget; \
110-
rm -rf /var/lib/apt/lists/*; \
111110
\
112111
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
113112
\
114113
apt-mark auto '.*' > /dev/null; \
115114
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
116115
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
116+
rm -rf /var/lib/apt/lists/*; \
117117
\
118118
python get-pip.py \
119119
--disable-pip-version-check \

‎3.5/stretch/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RUN set -ex \
4545
zlib1g-dev \
4646
# as of Stretch, "gpg" is no longer included by default
4747
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
48-
&& rm -rf /var/lib/apt/lists/* \
4948
\
5049
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
5150
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
@@ -81,6 +80,7 @@ RUN set -ex \
8180
| sort -u \
8281
| xargs -r apt-mark manual \
8382
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
83+
&& rm -rf /var/lib/apt/lists/* \
8484
\
8585
&& find /usr/local -depth \
8686
\( \
@@ -107,13 +107,13 @@ RUN set -ex; \
107107
savedAptMark="$(apt-mark showmanual)"; \
108108
apt-get update; \
109109
apt-get install -y --no-install-recommends wget; \
110-
rm -rf /var/lib/apt/lists/*; \
111110
\
112111
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
113112
\
114113
apt-mark auto '.*' > /dev/null; \
115114
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
116115
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
116+
rm -rf /var/lib/apt/lists/*; \
117117
\
118118
python get-pip.py \
119119
--disable-pip-version-check \

‎3.6/jessie/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RUN set -ex \
4545
zlib1g-dev \
4646
# as of Stretch, "gpg" is no longer included by default
4747
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
48-
&& rm -rf /var/lib/apt/lists/* \
4948
\
5049
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
5150
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
@@ -81,6 +80,7 @@ RUN set -ex \
8180
| sort -u \
8281
| xargs -r apt-mark manual \
8382
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
83+
&& rm -rf /var/lib/apt/lists/* \
8484
\
8585
&& find /usr/local -depth \
8686
\( \
@@ -107,13 +107,13 @@ RUN set -ex; \
107107
savedAptMark="$(apt-mark showmanual)"; \
108108
apt-get update; \
109109
apt-get install -y --no-install-recommends wget; \
110-
rm -rf /var/lib/apt/lists/*; \
111110
\
112111
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
113112
\
114113
apt-mark auto '.*' > /dev/null; \
115114
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
116115
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
116+
rm -rf /var/lib/apt/lists/*; \
117117
\
118118
python get-pip.py \
119119
--disable-pip-version-check \

‎3.6/stretch/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RUN set -ex \
4545
zlib1g-dev \
4646
# as of Stretch, "gpg" is no longer included by default
4747
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
48-
&& rm -rf /var/lib/apt/lists/* \
4948
\
5049
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
5150
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
@@ -81,6 +80,7 @@ RUN set -ex \
8180
| sort -u \
8281
| xargs -r apt-mark manual \
8382
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
83+
&& rm -rf /var/lib/apt/lists/* \
8484
\
8585
&& find /usr/local -depth \
8686
\( \
@@ -107,13 +107,13 @@ RUN set -ex; \
107107
savedAptMark="$(apt-mark showmanual)"; \
108108
apt-get update; \
109109
apt-get install -y --no-install-recommends wget; \
110-
rm -rf /var/lib/apt/lists/*; \
111110
\
112111
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
113112
\
114113
apt-mark auto '.*' > /dev/null; \
115114
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
116115
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
116+
rm -rf /var/lib/apt/lists/*; \
117117
\
118118
python get-pip.py \
119119
--disable-pip-version-check \

‎3.7/stretch/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RUN set -ex \
4545
zlib1g-dev \
4646
# as of Stretch, "gpg" is no longer included by default
4747
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
48-
&& rm -rf /var/lib/apt/lists/* \
4948
\
5049
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
5150
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
@@ -81,6 +80,7 @@ RUN set -ex \
8180
| sort -u \
8281
| xargs -r apt-mark manual \
8382
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
83+
&& rm -rf /var/lib/apt/lists/* \
8484
\
8585
&& find /usr/local -depth \
8686
\( \
@@ -107,13 +107,13 @@ RUN set -ex; \
107107
savedAptMark="$(apt-mark showmanual)"; \
108108
apt-get update; \
109109
apt-get install -y --no-install-recommends wget; \
110-
rm -rf /var/lib/apt/lists/*; \
111110
\
112111
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
113112
\
114113
apt-mark auto '.*' > /dev/null; \
115114
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
116115
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
116+
rm -rf /var/lib/apt/lists/*; \
117117
\
118118
python get-pip.py \
119119
--disable-pip-version-check \

‎Dockerfile-caveman-slim.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ RUN set -ex \
3939
zlib1g-dev \
4040
# as of Stretch, "gpg" is no longer included by default
4141
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
42-
&& rm -rf /var/lib/apt/lists/* \
4342
\
4443
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
4544
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
@@ -72,6 +71,7 @@ RUN set -ex \
7271
| sort -u \
7372
| xargs -r apt-mark manual \
7473
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
74+
&& rm -rf /var/lib/apt/lists/* \
7575
\
7676
&& find /usr/local -depth \
7777
\( \
@@ -91,13 +91,13 @@ RUN set -ex; \
9191
savedAptMark="$(apt-mark showmanual)"; \
9292
apt-get update; \
9393
apt-get install -y --no-install-recommends wget; \
94-
rm -rf /var/lib/apt/lists/*; \
9594
\
9695
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
9796
\
9897
apt-mark auto '.*' > /dev/null; \
9998
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
10099
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
100+
rm -rf /var/lib/apt/lists/*; \
101101
\
102102
python get-pip.py \
103103
--disable-pip-version-check \

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy