Skip to content

Commit a9f19e9

Browse files
yosifkityosifkit
committed
Apply minor changes to non 7.4 versions to make deleting lines easier for 7.4
1 parent d92a953 commit a9f19e9

File tree

34 files changed

+136
-100
lines changed

34 files changed

+136
-100
lines changed

‎7.1/alpine3.8/cli/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,11 @@ RUN set -xe \
165165
\
166166
&& apk del --no-network .build-deps \
167167
\
168-
# https://github.com/docker-library/php/issues/443
168+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
169169
&& pecl update-channels \
170-
&& rm -rf /tmp/pear ~/.pearrc
170+
&& rm -rf /tmp/pear ~/.pearrc \
171+
# smoke test
172+
&& php --version
171173

172174
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
173175

‎7.1/alpine3.8/fpm/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,11 @@ RUN set -xe \
166166
\
167167
&& apk del --no-network .build-deps \
168168
\
169-
# https://github.com/docker-library/php/issues/443
169+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
170170
&& pecl update-channels \
171-
&& rm -rf /tmp/pear ~/.pearrc
171+
&& rm -rf /tmp/pear ~/.pearrc \
172+
# smoke test
173+
&& php --version
172174

173175
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
174176

‎7.1/alpine3.8/zts/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,11 @@ RUN set -xe \
166166
\
167167
&& apk del --no-network .build-deps \
168168
\
169-
# https://github.com/docker-library/php/issues/443
169+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
170170
&& pecl update-channels \
171-
&& rm -rf /tmp/pear ~/.pearrc
171+
&& rm -rf /tmp/pear ~/.pearrc \
172+
# smoke test
173+
&& php --version
172174

173175
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
174176

‎7.1/alpine3.9/cli/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,11 @@ RUN set -xe \
165165
\
166166
&& apk del --no-network .build-deps \
167167
\
168-
# https://github.com/docker-library/php/issues/443
168+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
169169
&& pecl update-channels \
170-
&& rm -rf /tmp/pear ~/.pearrc
170+
&& rm -rf /tmp/pear ~/.pearrc \
171+
# smoke test
172+
&& php --version
171173

172174
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
173175

‎7.1/alpine3.9/fpm/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,11 @@ RUN set -xe \
166166
\
167167
&& apk del --no-network .build-deps \
168168
\
169-
# https://github.com/docker-library/php/issues/443
169+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
170170
&& pecl update-channels \
171-
&& rm -rf /tmp/pear ~/.pearrc
171+
&& rm -rf /tmp/pear ~/.pearrc \
172+
# smoke test
173+
&& php --version
172174

173175
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
174176

‎7.1/alpine3.9/zts/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,11 @@ RUN set -xe \
166166
\
167167
&& apk del --no-network .build-deps \
168168
\
169-
# https://github.com/docker-library/php/issues/443
169+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
170170
&& pecl update-channels \
171-
&& rm -rf /tmp/pear ~/.pearrc
171+
&& rm -rf /tmp/pear ~/.pearrc \
172+
# smoke test
173+
&& php --version
172174

173175
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
174176

‎7.1/jessie/apache/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,11 @@ RUN set -eux; \
249249
; \
250250
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
251251
\
252-
php --version; \
253-
\
254-
# https://github.com/docker-library/php/issues/443
252+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
255253
pecl update-channels; \
256-
rm -rf /tmp/pear ~/.pearrc
254+
rm -rf /tmp/pear ~/.pearrc; \
255+
# smoke test
256+
php --version
257257

258258
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
259259

‎7.1/jessie/cli/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ RUN set -eux; \
189189
; \
190190
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
191191
\
192-
php --version; \
193-
\
194-
# https://github.com/docker-library/php/issues/443
192+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
195193
pecl update-channels; \
196-
rm -rf /tmp/pear ~/.pearrc
194+
rm -rf /tmp/pear ~/.pearrc; \
195+
# smoke test
196+
php --version
197197

198198
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
199199

‎7.1/jessie/fpm/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@ RUN set -eux; \
190190
; \
191191
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
192192
\
193-
php --version; \
194-
\
195-
# https://github.com/docker-library/php/issues/443
193+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
196194
pecl update-channels; \
197-
rm -rf /tmp/pear ~/.pearrc
195+
rm -rf /tmp/pear ~/.pearrc; \
196+
# smoke test
197+
php --version
198198

199199
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
200200

‎7.1/jessie/zts/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@ RUN set -eux; \
190190
; \
191191
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
192192
\
193-
php --version; \
194-
\
195-
# https://github.com/docker-library/php/issues/443
193+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
196194
pecl update-channels; \
197-
rm -rf /tmp/pear ~/.pearrc
195+
rm -rf /tmp/pear ~/.pearrc; \
196+
# smoke test
197+
php --version
198198

199199
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
200200

‎7.1/stretch/apache/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,11 @@ RUN set -eux; \
249249
; \
250250
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
251251
\
252-
php --version; \
253-
\
254-
# https://github.com/docker-library/php/issues/443
252+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
255253
pecl update-channels; \
256-
rm -rf /tmp/pear ~/.pearrc
254+
rm -rf /tmp/pear ~/.pearrc; \
255+
# smoke test
256+
php --version
257257

258258
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
259259

‎7.1/stretch/cli/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ RUN set -eux; \
189189
; \
190190
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
191191
\
192-
php --version; \
193-
\
194-
# https://github.com/docker-library/php/issues/443
192+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
195193
pecl update-channels; \
196-
rm -rf /tmp/pear ~/.pearrc
194+
rm -rf /tmp/pear ~/.pearrc; \
195+
# smoke test
196+
php --version
197197

198198
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
199199

‎7.1/stretch/fpm/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@ RUN set -eux; \
190190
; \
191191
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
192192
\
193-
php --version; \
194-
\
195-
# https://github.com/docker-library/php/issues/443
193+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
196194
pecl update-channels; \
197-
rm -rf /tmp/pear ~/.pearrc
195+
rm -rf /tmp/pear ~/.pearrc; \
196+
# smoke test
197+
php --version
198198

199199
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
200200

‎7.1/stretch/zts/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@ RUN set -eux; \
190190
; \
191191
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
192192
\
193-
php --version; \
194-
\
195-
# https://github.com/docker-library/php/issues/443
193+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
196194
pecl update-channels; \
197-
rm -rf /tmp/pear ~/.pearrc
195+
rm -rf /tmp/pear ~/.pearrc; \
196+
# smoke test
197+
php --version
198198

199199
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
200200

‎7.2/alpine3.8/cli/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,11 @@ RUN set -xe \
171171
\
172172
&& apk del --no-network .build-deps \
173173
\
174-
# https://github.com/docker-library/php/issues/443
174+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
175175
&& pecl update-channels \
176-
&& rm -rf /tmp/pear ~/.pearrc
176+
&& rm -rf /tmp/pear ~/.pearrc \
177+
# smoke test
178+
&& php --version
177179

178180
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
179181

‎7.2/alpine3.8/fpm/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,11 @@ RUN set -xe \
172172
\
173173
&& apk del --no-network .build-deps \
174174
\
175-
# https://github.com/docker-library/php/issues/443
175+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
176176
&& pecl update-channels \
177-
&& rm -rf /tmp/pear ~/.pearrc
177+
&& rm -rf /tmp/pear ~/.pearrc \
178+
# smoke test
179+
&& php --version
178180

179181
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
180182

‎7.2/alpine3.8/zts/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,11 @@ RUN set -xe \
172172
\
173173
&& apk del --no-network .build-deps \
174174
\
175-
# https://github.com/docker-library/php/issues/443
175+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
176176
&& pecl update-channels \
177-
&& rm -rf /tmp/pear ~/.pearrc
177+
&& rm -rf /tmp/pear ~/.pearrc \
178+
# smoke test
179+
&& php --version
178180

179181
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
180182

‎7.2/alpine3.9/cli/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,11 @@ RUN set -xe \
171171
\
172172
&& apk del --no-network .build-deps \
173173
\
174-
# https://github.com/docker-library/php/issues/443
174+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
175175
&& pecl update-channels \
176-
&& rm -rf /tmp/pear ~/.pearrc
176+
&& rm -rf /tmp/pear ~/.pearrc \
177+
# smoke test
178+
&& php --version
177179

178180
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
179181

‎7.2/alpine3.9/fpm/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,11 @@ RUN set -xe \
172172
\
173173
&& apk del --no-network .build-deps \
174174
\
175-
# https://github.com/docker-library/php/issues/443
175+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
176176
&& pecl update-channels \
177-
&& rm -rf /tmp/pear ~/.pearrc
177+
&& rm -rf /tmp/pear ~/.pearrc \
178+
# smoke test
179+
&& php --version
178180

179181
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
180182

‎7.2/alpine3.9/zts/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,11 @@ RUN set -xe \
172172
\
173173
&& apk del --no-network .build-deps \
174174
\
175-
# https://github.com/docker-library/php/issues/443
175+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
176176
&& pecl update-channels \
177-
&& rm -rf /tmp/pear ~/.pearrc
177+
&& rm -rf /tmp/pear ~/.pearrc \
178+
# smoke test
179+
&& php --version
178180

179181
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
180182

‎7.2/stretch/apache/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,11 @@ RUN set -eux; \
268268
; \
269269
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
270270
\
271-
php --version; \
272-
\
273-
# https://github.com/docker-library/php/issues/443
271+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
274272
pecl update-channels; \
275-
rm -rf /tmp/pear ~/.pearrc
273+
rm -rf /tmp/pear ~/.pearrc; \
274+
# smoke test
275+
php --version
276276

277277
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
278278

‎7.2/stretch/cli/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,11 @@ RUN set -eux; \
208208
; \
209209
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
210210
\
211-
php --version; \
212-
\
213-
# https://github.com/docker-library/php/issues/443
211+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
214212
pecl update-channels; \
215-
rm -rf /tmp/pear ~/.pearrc
213+
rm -rf /tmp/pear ~/.pearrc; \
214+
# smoke test
215+
php --version
216216

217217
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
218218

‎7.2/stretch/fpm/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ RUN set -eux; \
209209
; \
210210
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
211211
\
212-
php --version; \
213-
\
214-
# https://github.com/docker-library/php/issues/443
212+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
215213
pecl update-channels; \
216-
rm -rf /tmp/pear ~/.pearrc
214+
rm -rf /tmp/pear ~/.pearrc; \
215+
# smoke test
216+
php --version
217217

218218
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
219219

‎7.2/stretch/zts/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ RUN set -eux; \
209209
; \
210210
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
211211
\
212-
php --version; \
213-
\
214-
# https://github.com/docker-library/php/issues/443
212+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
215213
pecl update-channels; \
216-
rm -rf /tmp/pear ~/.pearrc
214+
rm -rf /tmp/pear ~/.pearrc; \
215+
# smoke test
216+
php --version
217217

218218
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
219219

‎7.3/alpine3.8/cli/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,11 @@ RUN set -xe \
171171
\
172172
&& apk del --no-network .build-deps \
173173
\
174-
# https://github.com/docker-library/php/issues/443
174+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
175175
&& pecl update-channels \
176-
&& rm -rf /tmp/pear ~/.pearrc
176+
&& rm -rf /tmp/pear ~/.pearrc \
177+
# smoke test
178+
&& php --version
177179

178180
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
179181

‎7.3/alpine3.8/fpm/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,11 @@ RUN set -xe \
172172
\
173173
&& apk del --no-network .build-deps \
174174
\
175-
# https://github.com/docker-library/php/issues/443
175+
# update pecl channel definitions https://github.com/docker-library/php/issues/443
176176
&& pecl update-channels \
177-
&& rm -rf /tmp/pear ~/.pearrc
177+
&& rm -rf /tmp/pear ~/.pearrc \
178+
# smoke test
179+
&& php --version
178180

179181
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
180182

0 commit comments

Comments
 (0)