Skip to content

Commit f936910

Browse files
authored
Merge pull request #1096 from infosiftr/pear-8.0
Keep "pecl update-channels" for 8.0 also
2 parents 6944008 + deb4a80 commit f936910

File tree

8 files changed

+24
-4
lines changed

8 files changed

+24
-4
lines changed

8.0/alpine3.12/cli/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/alpine3.12/fpm/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/buster/apache/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/buster/cli/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/buster/fpm/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/buster/zts/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile-alpine.template

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,10 @@ RUN set -eux; \
188188
\
189189
apk del --no-network .build-deps; \
190190
\
191-
{{ if (.version | version_id) < ("8" | version_id) then ( -}}
192191
# update pecl channel definitions https://github.com/docker-library/php/issues/443
193192
pecl update-channels; \
194193
rm -rf /tmp/pear ~/.pearrc; \
195194
\
196-
{{ ) else "" end -}}
197195
# smoke test
198196
php --version
199197

Dockerfile-debian.template

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,10 @@ RUN set -eux; \
221221
; \
222222
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
223223
\
224-
{{ if (.version | version_id) < ("8" | version_id) then ( -}}
225224
# update pecl channel definitions https://github.com/docker-library/php/issues/443
226225
pecl update-channels; \
227226
rm -rf /tmp/pear ~/.pearrc; \
228227
\
229-
{{ ) else "" end -}}
230228
# smoke test
231229
php --version
232230

0 commit comments

Comments
 (0)