Skip to content

Commit 4ed913d

Browse files
cytopiacytopia
committed
Fix order of packet removal
1 parent ef71175 commit 4ed913d

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎Dockerfiles/Dockerfile.jessie‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ ENV RUNTIME_TOOLS \
103103
# && mkdir -p "/usr/local/ssl/lib/${debMultiarch}" \
104104
# && ln -s /usr/local/ssl/lib/* "/usr/local/ssl/lib/${debMultiarch}/" \
105105
## Remove Dependencies
106-
# && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
107-
# ${BUILD_TOOLS} \
108106
# && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
109107
# apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
110108
# ${BUILD_TOOLS_32}; \
111109
# fi \
110+
# && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
111+
# ${BUILD_TOOLS} \
112112
# && apt-get clean \
113113
# && rm -rf /var/lib/apt/lists/*
114114

@@ -190,13 +190,13 @@ RUN set -eux \
190190
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
191191
&& docker-php-source delete \
192192
# Remove Dependencies
193-
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
194-
${PHP_BUILD_DEPS} \
195-
${BUILD_TOOLS} \
196193
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
197194
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
198195
${BUILD_TOOLS_32}; \
199196
fi \
197+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
198+
${PHP_BUILD_DEPS} \
199+
${BUILD_TOOLS} \
200200
# Install Run-time requirements
201201
&& apt-get update \
202202
&& apt-get install -y --no-install-recommends --no-install-suggests \

‎Dockerfiles/Dockerfile.jessie-arm64‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@ RUN set -eux \
130130
# && mkdir -p "/usr/local/ssl/lib/${debMultiarch}" \
131131
# && ln -s /usr/local/ssl/lib/* "/usr/local/ssl/lib/${debMultiarch}/" \
132132
## Remove Dependencies
133-
# && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
134-
# ${BUILD_TOOLS} \
135133
# && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
136134
# apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
137135
# ${BUILD_TOOLS_32}; \
138136
# fi \
137+
# && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
138+
# ${BUILD_TOOLS} \
139139
# && apt-get clean \
140140
# && rm -rf /var/lib/apt/lists/*
141141

@@ -217,13 +217,13 @@ RUN set -eux \
217217
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
218218
&& docker-php-source delete \
219219
# Remove Dependencies
220-
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
221-
${PHP_BUILD_DEPS} \
222-
${BUILD_TOOLS} \
223220
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
224221
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
225222
${BUILD_TOOLS_32}; \
226223
fi \
224+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
225+
${PHP_BUILD_DEPS} \
226+
${BUILD_TOOLS} \
227227
# Install Run-time requirements
228228
&& apt-get update \
229229
&& apt-get install -y --no-install-recommends --no-install-suggests \

‎Dockerfiles/Dockerfile.stretch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ RUN set -eux \
101101
&& mkdir -p "/usr/local/ssl/lib/${debMultiarch}" \
102102
&& ln -s /usr/local/ssl/lib/* "/usr/local/ssl/lib/${debMultiarch}/" \
103103
# Remove Dependencies
104-
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
105-
${BUILD_TOOLS} \
106104
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
107105
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
108106
${BUILD_TOOLS_32}; \
109107
fi \
108+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
109+
${BUILD_TOOLS} \
110110
&& apt-get clean \
111111
&& rm -rf /var/lib/apt/lists/*
112112

@@ -191,13 +191,13 @@ RUN set -eux \
191191
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
192192
&& docker-php-source delete \
193193
# Remove Dependencies
194-
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
195-
${PHP_BUILD_DEPS} \
196-
${BUILD_TOOLS} \
197194
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "i386" ]; then \
198195
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
199196
${BUILD_TOOLS_32}; \
200197
fi \
198+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
199+
${PHP_BUILD_DEPS} \
200+
${BUILD_TOOLS} \
201201
# Install Run-time requirements
202202
&& apt-get update \
203203
&& apt-get install -y --no-install-recommends --no-install-suggests \

0 commit comments

Comments
 (0)