Skip to content

Commit 9ac0bd6

Browse files
principlesoftware-devprinciplesoftware-dev
committed
Merge pull request #853 from infosiftr/busted
Replace "stretch" with "buster" for PHP 7.4-rc given the imminent Debian release
2 parents 5faa3c8 + 69a19da commit 9ac0bd6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+143
-1867
lines changed

‎.travis.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ language: bash
22
services: docker
33

44
env:
5-
- VERSION=7.4-rc VARIANT=stretch/cli
6-
- VERSION=7.4-rc VARIANT=stretch/apache
7-
- VERSION=7.4-rc VARIANT=stretch/fpm
8-
- VERSION=7.4-rc VARIANT=stretch/zts
5+
- VERSION=7.4-rc VARIANT=buster/cli
6+
- VERSION=7.4-rc VARIANT=buster/apache
7+
- VERSION=7.4-rc VARIANT=buster/fpm
8+
- VERSION=7.4-rc VARIANT=buster/zts
99
- VERSION=7.4-rc VARIANT=alpine3.10/cli
1010
- VERSION=7.4-rc VARIANT=alpine3.10/fpm
1111
- VERSION=7.4-rc VARIANT=alpine3.10/zts
12-
- VERSION=7.4-rc VARIANT=alpine3.9/cli
13-
- VERSION=7.4-rc VARIANT=alpine3.9/fpm
14-
- VERSION=7.4-rc VARIANT=alpine3.9/zts
1512
- VERSION=7.3 VARIANT=stretch/cli
1613
- VERSION=7.3 VARIANT=stretch/apache
1714
- VERSION=7.3 VARIANT=stretch/fpm

‎7.2/stretch/apache/Dockerfile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,7 @@ COPY docker-php-source /usr/local/bin/
166166
RUN set -eux; \
167167
\
168168
savedAptMark="$(apt-mark showmanual)"; \
169-
apt-get update; \
170-
apt-get install -y --no-install-recommends \
171-
libcurl4-openssl-dev \
172-
libedit-dev \
173-
libsodium-dev \
174-
libsqlite3-dev \
175-
libssl-dev \
176-
libxml2-dev \
177-
zlib1g-dev \
178-
${PHP_EXTRA_BUILD_DEPS:-} \
179-
; \
180-
##<argon2>##
169+
##<argon2-stretch>##
181170
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
182171
{ \
183172
echo 'Package: *'; \
@@ -188,9 +177,19 @@ RUN set -eux; \
188177
echo 'Pin: release n=buster'; \
189178
echo 'Pin-Priority: 990'; \
190179
} > /etc/apt/preferences.d/argon2-buster; \
180+
##</argon2-stretch>##
191181
apt-get update; \
192-
apt-get install -y --no-install-recommends libargon2-dev; \
193-
##</argon2>##
182+
apt-get install -y --no-install-recommends \
183+
libargon2-dev \
184+
libcurl4-openssl-dev \
185+
libedit-dev \
186+
libsodium-dev \
187+
libsqlite3-dev \
188+
libssl-dev \
189+
libxml2-dev \
190+
zlib1g-dev \
191+
${PHP_EXTRA_BUILD_DEPS:-} \
192+
; \
194193
rm -rf /var/lib/apt/lists/*; \
195194
\
196195
export \

‎7.2/stretch/cli/Dockerfile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,7 @@ COPY docker-php-source /usr/local/bin/
106106
RUN set -eux; \
107107
\
108108
savedAptMark="$(apt-mark showmanual)"; \
109-
apt-get update; \
110-
apt-get install -y --no-install-recommends \
111-
libcurl4-openssl-dev \
112-
libedit-dev \
113-
libsodium-dev \
114-
libsqlite3-dev \
115-
libssl-dev \
116-
libxml2-dev \
117-
zlib1g-dev \
118-
${PHP_EXTRA_BUILD_DEPS:-} \
119-
; \
120-
##<argon2>##
109+
##<argon2-stretch>##
121110
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
122111
{ \
123112
echo 'Package: *'; \
@@ -128,9 +117,19 @@ RUN set -eux; \
128117
echo 'Pin: release n=buster'; \
129118
echo 'Pin-Priority: 990'; \
130119
} > /etc/apt/preferences.d/argon2-buster; \
120+
##</argon2-stretch>##
131121
apt-get update; \
132-
apt-get install -y --no-install-recommends libargon2-dev; \
133-
##</argon2>##
122+
apt-get install -y --no-install-recommends \
123+
libargon2-dev \
124+
libcurl4-openssl-dev \
125+
libedit-dev \
126+
libsodium-dev \
127+
libsqlite3-dev \
128+
libssl-dev \
129+
libxml2-dev \
130+
zlib1g-dev \
131+
${PHP_EXTRA_BUILD_DEPS:-} \
132+
; \
134133
rm -rf /var/lib/apt/lists/*; \
135134
\
136135
export \

‎7.2/stretch/fpm/Dockerfile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,7 @@ COPY docker-php-source /usr/local/bin/
107107
RUN set -eux; \
108108
\
109109
savedAptMark="$(apt-mark showmanual)"; \
110-
apt-get update; \
111-
apt-get install -y --no-install-recommends \
112-
libcurl4-openssl-dev \
113-
libedit-dev \
114-
libsodium-dev \
115-
libsqlite3-dev \
116-
libssl-dev \
117-
libxml2-dev \
118-
zlib1g-dev \
119-
${PHP_EXTRA_BUILD_DEPS:-} \
120-
; \
121-
##<argon2>##
110+
##<argon2-stretch>##
122111
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
123112
{ \
124113
echo 'Package: *'; \
@@ -129,9 +118,19 @@ RUN set -eux; \
129118
echo 'Pin: release n=buster'; \
130119
echo 'Pin-Priority: 990'; \
131120
} > /etc/apt/preferences.d/argon2-buster; \
121+
##</argon2-stretch>##
132122
apt-get update; \
133-
apt-get install -y --no-install-recommends libargon2-dev; \
134-
##</argon2>##
123+
apt-get install -y --no-install-recommends \
124+
libargon2-dev \
125+
libcurl4-openssl-dev \
126+
libedit-dev \
127+
libsodium-dev \
128+
libsqlite3-dev \
129+
libssl-dev \
130+
libxml2-dev \
131+
zlib1g-dev \
132+
${PHP_EXTRA_BUILD_DEPS:-} \
133+
; \
135134
rm -rf /var/lib/apt/lists/*; \
136135
\
137136
export \

‎7.2/stretch/zts/Dockerfile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,7 @@ COPY docker-php-source /usr/local/bin/
107107
RUN set -eux; \
108108
\
109109
savedAptMark="$(apt-mark showmanual)"; \
110-
apt-get update; \
111-
apt-get install -y --no-install-recommends \
112-
libcurl4-openssl-dev \
113-
libedit-dev \
114-
libsodium-dev \
115-
libsqlite3-dev \
116-
libssl-dev \
117-
libxml2-dev \
118-
zlib1g-dev \
119-
${PHP_EXTRA_BUILD_DEPS:-} \
120-
; \
121-
##<argon2>##
110+
##<argon2-stretch>##
122111
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
123112
{ \
124113
echo 'Package: *'; \
@@ -129,9 +118,19 @@ RUN set -eux; \
129118
echo 'Pin: release n=buster'; \
130119
echo 'Pin-Priority: 990'; \
131120
} > /etc/apt/preferences.d/argon2-buster; \
121+
##</argon2-stretch>##
132122
apt-get update; \
133-
apt-get install -y --no-install-recommends libargon2-dev; \
134-
##</argon2>##
123+
apt-get install -y --no-install-recommends \
124+
libargon2-dev \
125+
libcurl4-openssl-dev \
126+
libedit-dev \
127+
libsodium-dev \
128+
libsqlite3-dev \
129+
libssl-dev \
130+
libxml2-dev \
131+
zlib1g-dev \
132+
${PHP_EXTRA_BUILD_DEPS:-} \
133+
; \
135134
rm -rf /var/lib/apt/lists/*; \
136135
\
137136
export \

‎7.3/stretch/apache/Dockerfile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,7 @@ COPY docker-php-source /usr/local/bin/
166166
RUN set -eux; \
167167
\
168168
savedAptMark="$(apt-mark showmanual)"; \
169-
apt-get update; \
170-
apt-get install -y --no-install-recommends \
171-
libcurl4-openssl-dev \
172-
libedit-dev \
173-
libsodium-dev \
174-
libsqlite3-dev \
175-
libssl-dev \
176-
libxml2-dev \
177-
zlib1g-dev \
178-
${PHP_EXTRA_BUILD_DEPS:-} \
179-
; \
180-
##<argon2>##
169+
##<argon2-stretch>##
181170
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
182171
{ \
183172
echo 'Package: *'; \
@@ -188,9 +177,19 @@ RUN set -eux; \
188177
echo 'Pin: release n=buster'; \
189178
echo 'Pin-Priority: 990'; \
190179
} > /etc/apt/preferences.d/argon2-buster; \
180+
##</argon2-stretch>##
191181
apt-get update; \
192-
apt-get install -y --no-install-recommends libargon2-dev; \
193-
##</argon2>##
182+
apt-get install -y --no-install-recommends \
183+
libargon2-dev \
184+
libcurl4-openssl-dev \
185+
libedit-dev \
186+
libsodium-dev \
187+
libsqlite3-dev \
188+
libssl-dev \
189+
libxml2-dev \
190+
zlib1g-dev \
191+
${PHP_EXTRA_BUILD_DEPS:-} \
192+
; \
194193
rm -rf /var/lib/apt/lists/*; \
195194
\
196195
export \

‎7.3/stretch/cli/Dockerfile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,7 @@ COPY docker-php-source /usr/local/bin/
106106
RUN set -eux; \
107107
\
108108
savedAptMark="$(apt-mark showmanual)"; \
109-
apt-get update; \
110-
apt-get install -y --no-install-recommends \
111-
libcurl4-openssl-dev \
112-
libedit-dev \
113-
libsodium-dev \
114-
libsqlite3-dev \
115-
libssl-dev \
116-
libxml2-dev \
117-
zlib1g-dev \
118-
${PHP_EXTRA_BUILD_DEPS:-} \
119-
; \
120-
##<argon2>##
109+
##<argon2-stretch>##
121110
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
122111
{ \
123112
echo 'Package: *'; \
@@ -128,9 +117,19 @@ RUN set -eux; \
128117
echo 'Pin: release n=buster'; \
129118
echo 'Pin-Priority: 990'; \
130119
} > /etc/apt/preferences.d/argon2-buster; \
120+
##</argon2-stretch>##
131121
apt-get update; \
132-
apt-get install -y --no-install-recommends libargon2-dev; \
133-
##</argon2>##
122+
apt-get install -y --no-install-recommends \
123+
libargon2-dev \
124+
libcurl4-openssl-dev \
125+
libedit-dev \
126+
libsodium-dev \
127+
libsqlite3-dev \
128+
libssl-dev \
129+
libxml2-dev \
130+
zlib1g-dev \
131+
${PHP_EXTRA_BUILD_DEPS:-} \
132+
; \
134133
rm -rf /var/lib/apt/lists/*; \
135134
\
136135
export \

‎7.3/stretch/fpm/Dockerfile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,7 @@ COPY docker-php-source /usr/local/bin/
107107
RUN set -eux; \
108108
\
109109
savedAptMark="$(apt-mark showmanual)"; \
110-
apt-get update; \
111-
apt-get install -y --no-install-recommends \
112-
libcurl4-openssl-dev \
113-
libedit-dev \
114-
libsodium-dev \
115-
libsqlite3-dev \
116-
libssl-dev \
117-
libxml2-dev \
118-
zlib1g-dev \
119-
${PHP_EXTRA_BUILD_DEPS:-} \
120-
; \
121-
##<argon2>##
110+
##<argon2-stretch>##
122111
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
123112
{ \
124113
echo 'Package: *'; \
@@ -129,9 +118,19 @@ RUN set -eux; \
129118
echo 'Pin: release n=buster'; \
130119
echo 'Pin-Priority: 990'; \
131120
} > /etc/apt/preferences.d/argon2-buster; \
121+
##</argon2-stretch>##
132122
apt-get update; \
133-
apt-get install -y --no-install-recommends libargon2-dev; \
134-
##</argon2>##
123+
apt-get install -y --no-install-recommends \
124+
libargon2-dev \
125+
libcurl4-openssl-dev \
126+
libedit-dev \
127+
libsodium-dev \
128+
libsqlite3-dev \
129+
libssl-dev \
130+
libxml2-dev \
131+
zlib1g-dev \
132+
${PHP_EXTRA_BUILD_DEPS:-} \
133+
; \
135134
rm -rf /var/lib/apt/lists/*; \
136135
\
137136
export \

‎7.3/stretch/zts/Dockerfile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,7 @@ COPY docker-php-source /usr/local/bin/
107107
RUN set -eux; \
108108
\
109109
savedAptMark="$(apt-mark showmanual)"; \
110-
apt-get update; \
111-
apt-get install -y --no-install-recommends \
112-
libcurl4-openssl-dev \
113-
libedit-dev \
114-
libsodium-dev \
115-
libsqlite3-dev \
116-
libssl-dev \
117-
libxml2-dev \
118-
zlib1g-dev \
119-
${PHP_EXTRA_BUILD_DEPS:-} \
120-
; \
121-
##<argon2>##
110+
##<argon2-stretch>##
122111
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
123112
{ \
124113
echo 'Package: *'; \
@@ -129,9 +118,19 @@ RUN set -eux; \
129118
echo 'Pin: release n=buster'; \
130119
echo 'Pin-Priority: 990'; \
131120
} > /etc/apt/preferences.d/argon2-buster; \
121+
##</argon2-stretch>##
132122
apt-get update; \
133-
apt-get install -y --no-install-recommends libargon2-dev; \
134-
##</argon2>##
123+
apt-get install -y --no-install-recommends \
124+
libargon2-dev \
125+
libcurl4-openssl-dev \
126+
libedit-dev \
127+
libsodium-dev \
128+
libsqlite3-dev \
129+
libssl-dev \
130+
libxml2-dev \
131+
zlib1g-dev \
132+
${PHP_EXTRA_BUILD_DEPS:-} \
133+
; \
135134
rm -rf /var/lib/apt/lists/*; \
136135
\
137136
export \

0 commit comments

Comments
 (0)