Skip to content

Commit 7a3801a

Browse files
tianontianon
committed
Fix ldconfig ordering
1 parent 0bba31b commit 7a3801a

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

‎3.5/buster/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ RUN set -ex \
117117
-o \( -type f -a -name 'wininst-*.exe' \) \
118118
\) -exec rm -rf '{}' + \
119119
\
120+
&& ldconfig \
121+
\
120122
&& apt-mark auto '.*' > /dev/null \
121123
&& apt-mark manual $savedAptMark \
122124
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
@@ -129,8 +131,6 @@ RUN set -ex \
129131
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
130132
&& rm -rf /var/lib/apt/lists/* \
131133
\
132-
&& ldconfig \
133-
\
134134
&& python3 --version
135135

136136
# make some useful symlinks that are expected to exist

‎3.5/stretch/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ RUN set -ex \
117117
-o \( -type f -a -name 'wininst-*.exe' \) \
118118
\) -exec rm -rf '{}' + \
119119
\
120+
&& ldconfig \
121+
\
120122
&& apt-mark auto '.*' > /dev/null \
121123
&& apt-mark manual $savedAptMark \
122124
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
@@ -129,8 +131,6 @@ RUN set -ex \
129131
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
130132
&& rm -rf /var/lib/apt/lists/* \
131133
\
132-
&& ldconfig \
133-
\
134134
&& python3 --version
135135

136136
# make some useful symlinks that are expected to exist

‎3.6/buster/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ RUN set -ex \
117117
-o \( -type f -a -name 'wininst-*.exe' \) \
118118
\) -exec rm -rf '{}' + \
119119
\
120+
&& ldconfig \
121+
\
120122
&& apt-mark auto '.*' > /dev/null \
121123
&& apt-mark manual $savedAptMark \
122124
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
@@ -129,8 +131,6 @@ RUN set -ex \
129131
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
130132
&& rm -rf /var/lib/apt/lists/* \
131133
\
132-
&& ldconfig \
133-
\
134134
&& python3 --version
135135

136136
# make some useful symlinks that are expected to exist

‎3.6/stretch/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ RUN set -ex \
117117
-o \( -type f -a -name 'wininst-*.exe' \) \
118118
\) -exec rm -rf '{}' + \
119119
\
120+
&& ldconfig \
121+
\
120122
&& apt-mark auto '.*' > /dev/null \
121123
&& apt-mark manual $savedAptMark \
122124
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
@@ -129,8 +131,6 @@ RUN set -ex \
129131
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
130132
&& rm -rf /var/lib/apt/lists/* \
131133
\
132-
&& ldconfig \
133-
\
134134
&& python3 --version
135135

136136
# make some useful symlinks that are expected to exist

‎3.7/buster/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ RUN set -ex \
118118
-o \( -type f -a -name 'wininst-*.exe' \) \
119119
\) -exec rm -rf '{}' + \
120120
\
121+
&& ldconfig \
122+
\
121123
&& apt-mark auto '.*' > /dev/null \
122124
&& apt-mark manual $savedAptMark \
123125
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
@@ -130,8 +132,6 @@ RUN set -ex \
130132
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
131133
&& rm -rf /var/lib/apt/lists/* \
132134
\
133-
&& ldconfig \
134-
\
135135
&& python3 --version
136136

137137
# make some useful symlinks that are expected to exist

‎3.7/stretch/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ RUN set -ex \
118118
-o \( -type f -a -name 'wininst-*.exe' \) \
119119
\) -exec rm -rf '{}' + \
120120
\
121+
&& ldconfig \
122+
\
121123
&& apt-mark auto '.*' > /dev/null \
122124
&& apt-mark manual $savedAptMark \
123125
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
@@ -130,8 +132,6 @@ RUN set -ex \
130132
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
131133
&& rm -rf /var/lib/apt/lists/* \
132134
\
133-
&& ldconfig \
134-
\
135135
&& python3 --version
136136

137137
# make some useful symlinks that are expected to exist

‎3.8/buster/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ RUN set -ex \
8282
-o \( -type f -a -name 'wininst-*.exe' \) \
8383
\) -exec rm -rf '{}' + \
8484
\
85+
&& ldconfig \
86+
\
8587
&& apt-mark auto '.*' > /dev/null \
8688
&& apt-mark manual $savedAptMark \
8789
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
@@ -94,8 +96,6 @@ RUN set -ex \
9496
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
9597
&& rm -rf /var/lib/apt/lists/* \
9698
\
97-
&& ldconfig \
98-
\
9999
&& python3 --version
100100

101101
# make some useful symlinks that are expected to exist

‎Dockerfile-slim.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ RUN set -ex \
112112
-o \( -type f -a -name 'wininst-*.exe' \) \
113113
\) -exec rm -rf '{}' + \
114114
\
115+
&& ldconfig \
116+
\
115117
&& apt-mark auto '.*' > /dev/null \
116118
&& apt-mark manual $savedAptMark \
117119
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
@@ -124,8 +126,6 @@ RUN set -ex \
124126
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
125127
&& rm -rf /var/lib/apt/lists/* \
126128
\
127-
&& ldconfig \
128-
\
129129
&& python3 --version
130130

131131
# make some useful symlinks that are expected to exist

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