Skip to content

Commit c53a180

Browse files
tianontianon
committed
Swap from "sid" to "buster" and slightly adjust the implementation to match the templating
1 parent e1a4aff commit c53a180

File tree

15 files changed

+139
-165
lines changed

15 files changed

+139
-165
lines changed

‎7.2/stretch/apache/Dockerfile

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@ RUN set -eux; \
1515
echo 'Pin-Priority: -1'; \
1616
} > /etc/apt/preferences.d/no-debian-php
1717

18-
RUN set -eux; \
19-
{ \
20-
echo 'deb http://deb.debian.org/debian sid main'; \
21-
} >> /etc/apt/sources.list; \
22-
{ \
23-
echo 'Package: *'; \
24-
echo 'Pin: release n=sid'; \
25-
echo 'Pin-Priority: 100'; \
26-
} > /etc/apt/preferences.d/no-sid; \
27-
{ \
28-
echo 'Package: libargon2*'; \
29-
echo 'Pin: release n=sid'; \
30-
echo 'Pin-Priority: 990'; \
31-
} > /etc/apt/preferences.d/argon-sid
32-
3318
# dependencies required for running "phpize"
3419
# (see persistent deps below)
3520
ENV PHPIZE_DEPS \
@@ -179,7 +164,6 @@ RUN set -eux; \
179164
savedAptMark="$(apt-mark showmanual)"; \
180165
apt-get update; \
181166
apt-get install -y --no-install-recommends \
182-
libargon2-dev \
183167
libcurl4-openssl-dev \
184168
libedit-dev \
185169
libsodium-dev \
@@ -189,6 +173,20 @@ RUN set -eux; \
189173
zlib1g-dev \
190174
${PHP_EXTRA_BUILD_DEPS:-} \
191175
; \
176+
##<argon2>##
177+
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
178+
{ \
179+
echo 'Package: *'; \
180+
echo 'Pin: release n=buster'; \
181+
echo 'Pin-Priority: -10'; \
182+
echo; \
183+
echo 'Package: libargon2*'; \
184+
echo 'Pin: release n=buster'; \
185+
echo 'Pin-Priority: 990'; \
186+
} > /etc/apt/preferences.d/argon2-buster; \
187+
apt-get update; \
188+
apt-get install -y --no-install-recommends libargon2-dev; \
189+
##</argon2>##
192190
rm -rf /var/lib/apt/lists/*; \
193191
\
194192
export \

‎7.2/stretch/cli/Dockerfile

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@ RUN set -eux; \
1515
echo 'Pin-Priority: -1'; \
1616
} > /etc/apt/preferences.d/no-debian-php
1717

18-
RUN set -eux; \
19-
{ \
20-
echo 'deb http://deb.debian.org/debian sid main'; \
21-
} >> /etc/apt/sources.list; \
22-
{ \
23-
echo 'Package: *'; \
24-
echo 'Pin: release n=sid'; \
25-
echo 'Pin-Priority: 100'; \
26-
} > /etc/apt/preferences.d/no-sid; \
27-
{ \
28-
echo 'Package: libargon2*'; \
29-
echo 'Pin: release n=sid'; \
30-
echo 'Pin-Priority: 990'; \
31-
} > /etc/apt/preferences.d/argon-sid
32-
3318
# dependencies required for running "phpize"
3419
# (see persistent deps below)
3520
ENV PHPIZE_DEPS \
@@ -120,7 +105,6 @@ RUN set -eux; \
120105
savedAptMark="$(apt-mark showmanual)"; \
121106
apt-get update; \
122107
apt-get install -y --no-install-recommends \
123-
libargon2-dev \
124108
libcurl4-openssl-dev \
125109
libedit-dev \
126110
libsodium-dev \
@@ -130,6 +114,20 @@ RUN set -eux; \
130114
zlib1g-dev \
131115
${PHP_EXTRA_BUILD_DEPS:-} \
132116
; \
117+
##<argon2>##
118+
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
119+
{ \
120+
echo 'Package: *'; \
121+
echo 'Pin: release n=buster'; \
122+
echo 'Pin-Priority: -10'; \
123+
echo; \
124+
echo 'Package: libargon2*'; \
125+
echo 'Pin: release n=buster'; \
126+
echo 'Pin-Priority: 990'; \
127+
} > /etc/apt/preferences.d/argon2-buster; \
128+
apt-get update; \
129+
apt-get install -y --no-install-recommends libargon2-dev; \
130+
##</argon2>##
133131
rm -rf /var/lib/apt/lists/*; \
134132
\
135133
export \

‎7.2/stretch/fpm/Dockerfile

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@ RUN set -eux; \
1515
echo 'Pin-Priority: -1'; \
1616
} > /etc/apt/preferences.d/no-debian-php
1717

18-
RUN set -eux; \
19-
{ \
20-
echo 'deb http://deb.debian.org/debian sid main'; \
21-
} >> /etc/apt/sources.list; \
22-
{ \
23-
echo 'Package: *'; \
24-
echo 'Pin: release n=sid'; \
25-
echo 'Pin-Priority: 100'; \
26-
} > /etc/apt/preferences.d/no-sid; \
27-
{ \
28-
echo 'Package: libargon2*'; \
29-
echo 'Pin: release n=sid'; \
30-
echo 'Pin-Priority: 990'; \
31-
} > /etc/apt/preferences.d/argon-sid
32-
3318
# dependencies required for running "phpize"
3419
# (see persistent deps below)
3520
ENV PHPIZE_DEPS \
@@ -121,7 +106,6 @@ RUN set -eux; \
121106
savedAptMark="$(apt-mark showmanual)"; \
122107
apt-get update; \
123108
apt-get install -y --no-install-recommends \
124-
libargon2-dev \
125109
libcurl4-openssl-dev \
126110
libedit-dev \
127111
libsodium-dev \
@@ -131,6 +115,20 @@ RUN set -eux; \
131115
zlib1g-dev \
132116
${PHP_EXTRA_BUILD_DEPS:-} \
133117
; \
118+
##<argon2>##
119+
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
120+
{ \
121+
echo 'Package: *'; \
122+
echo 'Pin: release n=buster'; \
123+
echo 'Pin-Priority: -10'; \
124+
echo; \
125+
echo 'Package: libargon2*'; \
126+
echo 'Pin: release n=buster'; \
127+
echo 'Pin-Priority: 990'; \
128+
} > /etc/apt/preferences.d/argon2-buster; \
129+
apt-get update; \
130+
apt-get install -y --no-install-recommends libargon2-dev; \
131+
##</argon2>##
134132
rm -rf /var/lib/apt/lists/*; \
135133
\
136134
export \

‎7.2/stretch/zts/Dockerfile

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@ RUN set -eux; \
1515
echo 'Pin-Priority: -1'; \
1616
} > /etc/apt/preferences.d/no-debian-php
1717

18-
RUN set -eux; \
19-
{ \
20-
echo 'deb http://deb.debian.org/debian sid main'; \
21-
} >> /etc/apt/sources.list; \
22-
{ \
23-
echo 'Package: *'; \
24-
echo 'Pin: release n=sid'; \
25-
echo 'Pin-Priority: 100'; \
26-
} > /etc/apt/preferences.d/no-sid; \
27-
{ \
28-
echo 'Package: libargon2*'; \
29-
echo 'Pin: release n=sid'; \
30-
echo 'Pin-Priority: 990'; \
31-
} > /etc/apt/preferences.d/argon-sid
32-
3318
# dependencies required for running "phpize"
3419
# (see persistent deps below)
3520
ENV PHPIZE_DEPS \
@@ -121,7 +106,6 @@ RUN set -eux; \
121106
savedAptMark="$(apt-mark showmanual)"; \
122107
apt-get update; \
123108
apt-get install -y --no-install-recommends \
124-
libargon2-dev \
125109
libcurl4-openssl-dev \
126110
libedit-dev \
127111
libsodium-dev \
@@ -131,6 +115,20 @@ RUN set -eux; \
131115
zlib1g-dev \
132116
${PHP_EXTRA_BUILD_DEPS:-} \
133117
; \
118+
##<argon2>##
119+
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
120+
{ \
121+
echo 'Package: *'; \
122+
echo 'Pin: release n=buster'; \
123+
echo 'Pin-Priority: -10'; \
124+
echo; \
125+
echo 'Package: libargon2*'; \
126+
echo 'Pin: release n=buster'; \
127+
echo 'Pin-Priority: 990'; \
128+
} > /etc/apt/preferences.d/argon2-buster; \
129+
apt-get update; \
130+
apt-get install -y --no-install-recommends libargon2-dev; \
131+
##</argon2>##
134132
rm -rf /var/lib/apt/lists/*; \
135133
\
136134
export \

‎7.3-rc/alpine3.8/cli/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ COPY docker-php-source /usr/local/bin/
9696
RUN set -xe \
9797
&& apk add --no-cache --virtual .build-deps \
9898
$PHPIZE_DEPS \
99+
argon2-dev \
99100
coreutils \
100101
curl-dev \
101-
argon2-dev \
102102
libedit-dev \
103103
libressl-dev \
104104
libsodium-dev \

‎7.3-rc/alpine3.8/fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ COPY docker-php-source /usr/local/bin/
9797
RUN set -xe \
9898
&& apk add --no-cache --virtual .build-deps \
9999
$PHPIZE_DEPS \
100+
argon2-dev \
100101
coreutils \
101102
curl-dev \
102-
argon2-dev \
103103
libedit-dev \
104104
libressl-dev \
105105
libsodium-dev \

‎7.3-rc/alpine3.8/zts/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ COPY docker-php-source /usr/local/bin/
9797
RUN set -xe \
9898
&& apk add --no-cache --virtual .build-deps \
9999
$PHPIZE_DEPS \
100+
argon2-dev \
100101
coreutils \
101102
curl-dev \
102-
argon2-dev \
103103
libedit-dev \
104104
libressl-dev \
105105
libsodium-dev \

‎7.3-rc/stretch/apache/Dockerfile

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@ RUN set -eux; \
1515
echo 'Pin-Priority: -1'; \
1616
} > /etc/apt/preferences.d/no-debian-php
1717

18-
RUN set -eux; \
19-
{ \
20-
echo 'deb http://deb.debian.org/debian sid main'; \
21-
} >> /etc/apt/sources.list; \
22-
{ \
23-
echo 'Package: *'; \
24-
echo 'Pin: release n=sid'; \
25-
echo 'Pin-Priority: 100'; \
26-
} > /etc/apt/preferences.d/no-sid; \
27-
{ \
28-
echo 'Package: libargon2*'; \
29-
echo 'Pin: release n=sid'; \
30-
echo 'Pin-Priority: 990'; \
31-
} > /etc/apt/preferences.d/argon-sid
32-
3318
# dependencies required for running "phpize"
3419
# (see persistent deps below)
3520
ENV PHPIZE_DEPS \
@@ -179,7 +164,6 @@ RUN set -eux; \
179164
savedAptMark="$(apt-mark showmanual)"; \
180165
apt-get update; \
181166
apt-get install -y --no-install-recommends \
182-
libargon2-dev \
183167
libcurl4-openssl-dev \
184168
libedit-dev \
185169
libsodium-dev \
@@ -189,6 +173,20 @@ RUN set -eux; \
189173
zlib1g-dev \
190174
${PHP_EXTRA_BUILD_DEPS:-} \
191175
; \
176+
##<argon2>##
177+
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
178+
{ \
179+
echo 'Package: *'; \
180+
echo 'Pin: release n=buster'; \
181+
echo 'Pin-Priority: -10'; \
182+
echo; \
183+
echo 'Package: libargon2*'; \
184+
echo 'Pin: release n=buster'; \
185+
echo 'Pin-Priority: 990'; \
186+
} > /etc/apt/preferences.d/argon2-buster; \
187+
apt-get update; \
188+
apt-get install -y --no-install-recommends libargon2-dev; \
189+
##</argon2>##
192190
rm -rf /var/lib/apt/lists/*; \
193191
\
194192
export \

‎7.3-rc/stretch/cli/Dockerfile

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@ RUN set -eux; \
1515
echo 'Pin-Priority: -1'; \
1616
} > /etc/apt/preferences.d/no-debian-php
1717

18-
RUN set -eux; \
19-
{ \
20-
echo 'deb http://deb.debian.org/debian sid main'; \
21-
} >> /etc/apt/sources.list; \
22-
{ \
23-
echo 'Package: *'; \
24-
echo 'Pin: release n=sid'; \
25-
echo 'Pin-Priority: 100'; \
26-
} > /etc/apt/preferences.d/no-sid; \
27-
{ \
28-
echo 'Package: libargon2*'; \
29-
echo 'Pin: release n=sid'; \
30-
echo 'Pin-Priority: 990'; \
31-
} > /etc/apt/preferences.d/argon-sid
32-
3318
# dependencies required for running "phpize"
3419
# (see persistent deps below)
3520
ENV PHPIZE_DEPS \
@@ -120,7 +105,6 @@ RUN set -eux; \
120105
savedAptMark="$(apt-mark showmanual)"; \
121106
apt-get update; \
122107
apt-get install -y --no-install-recommends \
123-
libargon2-dev \
124108
libcurl4-openssl-dev \
125109
libedit-dev \
126110
libsodium-dev \
@@ -130,6 +114,20 @@ RUN set -eux; \
130114
zlib1g-dev \
131115
${PHP_EXTRA_BUILD_DEPS:-} \
132116
; \
117+
##<argon2>##
118+
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
119+
{ \
120+
echo 'Package: *'; \
121+
echo 'Pin: release n=buster'; \
122+
echo 'Pin-Priority: -10'; \
123+
echo; \
124+
echo 'Package: libargon2*'; \
125+
echo 'Pin: release n=buster'; \
126+
echo 'Pin-Priority: 990'; \
127+
} > /etc/apt/preferences.d/argon2-buster; \
128+
apt-get update; \
129+
apt-get install -y --no-install-recommends libargon2-dev; \
130+
##</argon2>##
133131
rm -rf /var/lib/apt/lists/*; \
134132
\
135133
export \

‎7.3-rc/stretch/fpm/Dockerfile

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@ RUN set -eux; \
1515
echo 'Pin-Priority: -1'; \
1616
} > /etc/apt/preferences.d/no-debian-php
1717

18-
RUN set -eux; \
19-
{ \
20-
echo 'deb http://deb.debian.org/debian sid main'; \
21-
} >> /etc/apt/sources.list; \
22-
{ \
23-
echo 'Package: *'; \
24-
echo 'Pin: release n=sid'; \
25-
echo 'Pin-Priority: 100'; \
26-
} > /etc/apt/preferences.d/no-sid; \
27-
{ \
28-
echo 'Package: libargon2*'; \
29-
echo 'Pin: release n=sid'; \
30-
echo 'Pin-Priority: 990'; \
31-
} > /etc/apt/preferences.d/argon-sid
32-
3318
# dependencies required for running "phpize"
3419
# (see persistent deps below)
3520
ENV PHPIZE_DEPS \
@@ -121,7 +106,6 @@ RUN set -eux; \
121106
savedAptMark="$(apt-mark showmanual)"; \
122107
apt-get update; \
123108
apt-get install -y --no-install-recommends \
124-
libargon2-dev \
125109
libcurl4-openssl-dev \
126110
libedit-dev \
127111
libsodium-dev \
@@ -131,6 +115,20 @@ RUN set -eux; \
131115
zlib1g-dev \
132116
${PHP_EXTRA_BUILD_DEPS:-} \
133117
; \
118+
##<argon2>##
119+
sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
120+
{ \
121+
echo 'Package: *'; \
122+
echo 'Pin: release n=buster'; \
123+
echo 'Pin-Priority: -10'; \
124+
echo; \
125+
echo 'Package: libargon2*'; \
126+
echo 'Pin: release n=buster'; \
127+
echo 'Pin-Priority: 990'; \
128+
} > /etc/apt/preferences.d/argon2-buster; \
129+
apt-get update; \
130+
apt-get install -y --no-install-recommends libargon2-dev; \
131+
##</argon2>##
134132
rm -rf /var/lib/apt/lists/*; \
135133
\
136134
export \

0 commit comments

Comments
 (0)