Skip to content

Add 7.4.0alpha1 #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 14, 2019
Merged

Add 7.4.0alpha1 #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e9d32b
Add 7.4.0alpha1
tianon Jun 13, 2019
d92a953
Fix build issues on 7.4.0-alpha1
yosifkit Jun 14, 2019
a9f19e9
Apply minor changes to non 7.4 versions to make deleting lines easier…
yosifkit Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ language: bash
services: docker

env:
- VERSION=7.4-rc VARIANT=stretch/cli
- VERSION=7.4-rc VARIANT=stretch/apache
- VERSION=7.4-rc VARIANT=stretch/fpm
- VERSION=7.4-rc VARIANT=stretch/zts
- VERSION=7.4-rc VARIANT=alpine3.9/cli
- VERSION=7.4-rc VARIANT=alpine3.9/fpm
- VERSION=7.4-rc VARIANT=alpine3.9/zts
- VERSION=7.3 VARIANT=stretch/cli
- VERSION=7.3 VARIANT=stretch/apache
- VERSION=7.3 VARIANT=stretch/fpm
Expand Down
6 changes: 4 additions & 2 deletions 7.1/alpine3.8/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.1/alpine3.8/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.1/alpine3.8/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.1/alpine3.9/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.1/alpine3.9/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.1/alpine3.9/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.1/jessie/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,11 +249,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.1/jessie/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.1/jessie/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.1/jessie/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.1/stretch/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,11 +249,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.1/stretch/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.1/stretch/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.1/stretch/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.2/alpine3.8/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.2/alpine3.8/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.2/alpine3.8/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.2/alpine3.9/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.2/alpine3.9/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.2/alpine3.9/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.2/stretch/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.2/stretch/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.2/stretch/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
8 changes: 4 additions & 4 deletions 7.2/stretch/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,11 @@ RUN set -eux; \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
php --version; \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc
rm -rf /tmp/pear ~/.pearrc; \
# smoke test
php --version

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

Expand Down
6 changes: 4 additions & 2 deletions 7.3/alpine3.8/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,11 @@ RUN set -xe \
\
&& apk del --no-network .build-deps \
\
# https://github.com/docker-library/php/issues/443
# update pecl channel definitions https://github.com/docker-library/php/issues/443
&& pecl update-channels \
&& rm -rf /tmp/pear ~/.pearrc
&& rm -rf /tmp/pear ~/.pearrc \
# smoke test
&& php --version

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

Expand Down
Loading