Skip to content

Commit 1fdbc53

Browse files
TimWollaTimWolla
committed
Install libargon2 from buster
1 parent a8b0940 commit 1fdbc53

File tree

10 files changed

+208
-1
lines changed

10 files changed

+208
-1
lines changed

‎7.2/stretch/apache/Dockerfile

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

18+
# Argon2-Start
19+
RUN set -eux; \
20+
{ \
21+
echo 'deb http://deb.debian.org/debian buster main'; \
22+
echo 'deb http://deb.debian.org/debian buster-updates main'; \
23+
echo 'deb http://security.debian.org buster/updates main'; \
24+
} >> /etc/apt/sources.list; \
25+
{ \
26+
echo 'Package: *'; \
27+
echo 'Pin: release n=buster'; \
28+
echo 'Pin-Priority: 100'; \
29+
} > /etc/apt/preferences.d/no-buster; \
30+
{ \
31+
echo 'Package: libargon2-0*'; \
32+
echo 'Pin: release n=buster'; \
33+
echo 'Pin-Priority: 990'; \
34+
} > /etc/apt/preferences.d/argon-buster
35+
# Argon2-End
36+
1837
# dependencies required for running "phpize"
1938
# (see persistent deps below)
2039
ENV PHPIZE_DEPS \
@@ -164,7 +183,9 @@ RUN set -eux; \
164183
savedAptMark="$(apt-mark showmanual)"; \
165184
apt-get update; \
166185
apt-get install -y --no-install-recommends \
186+
# Argon2-Start
167187
libargon2-0-dev \
188+
# Argon2-End
168189
libcurl4-openssl-dev \
169190
libedit-dev \
170191
libsodium-dev \
@@ -206,8 +227,10 @@ RUN set -eux; \
206227
--enable-mbstring \
207228
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
208229
--enable-mysqlnd \
230+
# Argon2-Start
209231
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
210232
--with-password-argon2 \
233+
# Argon2-End
211234
# https://wiki.php.net/rfc/libsodium
212235
--with-sodium=shared \
213236
\

‎7.2/stretch/cli/Dockerfile

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

18+
# Argon2-Start
19+
RUN set -eux; \
20+
{ \
21+
echo 'deb http://deb.debian.org/debian buster main'; \
22+
echo 'deb http://deb.debian.org/debian buster-updates main'; \
23+
echo 'deb http://security.debian.org buster/updates main'; \
24+
} >> /etc/apt/sources.list; \
25+
{ \
26+
echo 'Package: *'; \
27+
echo 'Pin: release n=buster'; \
28+
echo 'Pin-Priority: 100'; \
29+
} > /etc/apt/preferences.d/no-buster; \
30+
{ \
31+
echo 'Package: libargon2-0*'; \
32+
echo 'Pin: release n=buster'; \
33+
echo 'Pin-Priority: 990'; \
34+
} > /etc/apt/preferences.d/argon-buster
35+
# Argon2-End
36+
1837
# dependencies required for running "phpize"
1938
# (see persistent deps below)
2039
ENV PHPIZE_DEPS \
@@ -105,7 +124,9 @@ RUN set -eux; \
105124
savedAptMark="$(apt-mark showmanual)"; \
106125
apt-get update; \
107126
apt-get install -y --no-install-recommends \
127+
# Argon2-Start
108128
libargon2-0-dev \
129+
# Argon2-End
109130
libcurl4-openssl-dev \
110131
libedit-dev \
111132
libsodium-dev \
@@ -147,8 +168,10 @@ RUN set -eux; \
147168
--enable-mbstring \
148169
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
149170
--enable-mysqlnd \
171+
# Argon2-Start
150172
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
151173
--with-password-argon2 \
174+
# Argon2-End
152175
# https://wiki.php.net/rfc/libsodium
153176
--with-sodium=shared \
154177
\

‎7.2/stretch/fpm/Dockerfile

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

18+
# Argon2-Start
19+
RUN set -eux; \
20+
{ \
21+
echo 'deb http://deb.debian.org/debian buster main'; \
22+
echo 'deb http://deb.debian.org/debian buster-updates main'; \
23+
echo 'deb http://security.debian.org buster/updates main'; \
24+
} >> /etc/apt/sources.list; \
25+
{ \
26+
echo 'Package: *'; \
27+
echo 'Pin: release n=buster'; \
28+
echo 'Pin-Priority: 100'; \
29+
} > /etc/apt/preferences.d/no-buster; \
30+
{ \
31+
echo 'Package: libargon2-0*'; \
32+
echo 'Pin: release n=buster'; \
33+
echo 'Pin-Priority: 990'; \
34+
} > /etc/apt/preferences.d/argon-buster
35+
# Argon2-End
36+
1837
# dependencies required for running "phpize"
1938
# (see persistent deps below)
2039
ENV PHPIZE_DEPS \
@@ -106,7 +125,9 @@ RUN set -eux; \
106125
savedAptMark="$(apt-mark showmanual)"; \
107126
apt-get update; \
108127
apt-get install -y --no-install-recommends \
128+
# Argon2-Start
109129
libargon2-0-dev \
130+
# Argon2-End
110131
libcurl4-openssl-dev \
111132
libedit-dev \
112133
libsodium-dev \
@@ -148,8 +169,10 @@ RUN set -eux; \
148169
--enable-mbstring \
149170
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
150171
--enable-mysqlnd \
172+
# Argon2-Start
151173
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
152174
--with-password-argon2 \
175+
# Argon2-End
153176
# https://wiki.php.net/rfc/libsodium
154177
--with-sodium=shared \
155178
\

‎7.2/stretch/zts/Dockerfile

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

18+
# Argon2-Start
19+
RUN set -eux; \
20+
{ \
21+
echo 'deb http://deb.debian.org/debian buster main'; \
22+
echo 'deb http://deb.debian.org/debian buster-updates main'; \
23+
echo 'deb http://security.debian.org buster/updates main'; \
24+
} >> /etc/apt/sources.list; \
25+
{ \
26+
echo 'Package: *'; \
27+
echo 'Pin: release n=buster'; \
28+
echo 'Pin-Priority: 100'; \
29+
} > /etc/apt/preferences.d/no-buster; \
30+
{ \
31+
echo 'Package: libargon2-0*'; \
32+
echo 'Pin: release n=buster'; \
33+
echo 'Pin-Priority: 990'; \
34+
} > /etc/apt/preferences.d/argon-buster
35+
# Argon2-End
36+
1837
# dependencies required for running "phpize"
1938
# (see persistent deps below)
2039
ENV PHPIZE_DEPS \
@@ -106,7 +125,9 @@ RUN set -eux; \
106125
savedAptMark="$(apt-mark showmanual)"; \
107126
apt-get update; \
108127
apt-get install -y --no-install-recommends \
128+
# Argon2-Start
109129
libargon2-0-dev \
130+
# Argon2-End
110131
libcurl4-openssl-dev \
111132
libedit-dev \
112133
libsodium-dev \
@@ -148,8 +169,10 @@ RUN set -eux; \
148169
--enable-mbstring \
149170
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
150171
--enable-mysqlnd \
172+
# Argon2-Start
151173
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
152174
--with-password-argon2 \
175+
# Argon2-End
153176
# https://wiki.php.net/rfc/libsodium
154177
--with-sodium=shared \
155178
\

‎7.3-rc/stretch/apache/Dockerfile

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

18+
# Argon2-Start
19+
RUN set -eux; \
20+
{ \
21+
echo 'deb http://deb.debian.org/debian buster main'; \
22+
echo 'deb http://deb.debian.org/debian buster-updates main'; \
23+
echo 'deb http://security.debian.org buster/updates main'; \
24+
} >> /etc/apt/sources.list; \
25+
{ \
26+
echo 'Package: *'; \
27+
echo 'Pin: release n=buster'; \
28+
echo 'Pin-Priority: 100'; \
29+
} > /etc/apt/preferences.d/no-buster; \
30+
{ \
31+
echo 'Package: libargon2-0*'; \
32+
echo 'Pin: release n=buster'; \
33+
echo 'Pin-Priority: 990'; \
34+
} > /etc/apt/preferences.d/argon-buster
35+
# Argon2-End
36+
1837
# dependencies required for running "phpize"
1938
# (see persistent deps below)
2039
ENV PHPIZE_DEPS \
@@ -164,7 +183,9 @@ RUN set -eux; \
164183
savedAptMark="$(apt-mark showmanual)"; \
165184
apt-get update; \
166185
apt-get install -y --no-install-recommends \
186+
# Argon2-Start
167187
libargon2-0-dev \
188+
# Argon2-End
168189
libcurl4-openssl-dev \
169190
libedit-dev \
170191
libsodium-dev \
@@ -206,8 +227,10 @@ RUN set -eux; \
206227
--enable-mbstring \
207228
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
208229
--enable-mysqlnd \
230+
# Argon2-Start
209231
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
210232
--with-password-argon2 \
233+
# Argon2-End
211234
# https://wiki.php.net/rfc/libsodium
212235
--with-sodium=shared \
213236
\

‎7.3-rc/stretch/cli/Dockerfile

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

18+
# Argon2-Start
19+
RUN set -eux; \
20+
{ \
21+
echo 'deb http://deb.debian.org/debian buster main'; \
22+
echo 'deb http://deb.debian.org/debian buster-updates main'; \
23+
echo 'deb http://security.debian.org buster/updates main'; \
24+
} >> /etc/apt/sources.list; \
25+
{ \
26+
echo 'Package: *'; \
27+
echo 'Pin: release n=buster'; \
28+
echo 'Pin-Priority: 100'; \
29+
} > /etc/apt/preferences.d/no-buster; \
30+
{ \
31+
echo 'Package: libargon2-0*'; \
32+
echo 'Pin: release n=buster'; \
33+
echo 'Pin-Priority: 990'; \
34+
} > /etc/apt/preferences.d/argon-buster
35+
# Argon2-End
36+
1837
# dependencies required for running "phpize"
1938
# (see persistent deps below)
2039
ENV PHPIZE_DEPS \
@@ -105,7 +124,9 @@ RUN set -eux; \
105124
savedAptMark="$(apt-mark showmanual)"; \
106125
apt-get update; \
107126
apt-get install -y --no-install-recommends \
127+
# Argon2-Start
108128
libargon2-0-dev \
129+
# Argon2-End
109130
libcurl4-openssl-dev \
110131
libedit-dev \
111132
libsodium-dev \
@@ -147,8 +168,10 @@ RUN set -eux; \
147168
--enable-mbstring \
148169
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
149170
--enable-mysqlnd \
171+
# Argon2-Start
150172
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
151173
--with-password-argon2 \
174+
# Argon2-End
152175
# https://wiki.php.net/rfc/libsodium
153176
--with-sodium=shared \
154177
\

‎7.3-rc/stretch/fpm/Dockerfile

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

18+
# Argon2-Start
19+
RUN set -eux; \
20+
{ \
21+
echo 'deb http://deb.debian.org/debian buster main'; \
22+
echo 'deb http://deb.debian.org/debian buster-updates main'; \
23+
echo 'deb http://security.debian.org buster/updates main'; \
24+
} >> /etc/apt/sources.list; \
25+
{ \
26+
echo 'Package: *'; \
27+
echo 'Pin: release n=buster'; \
28+
echo 'Pin-Priority: 100'; \
29+
} > /etc/apt/preferences.d/no-buster; \
30+
{ \
31+
echo 'Package: libargon2-0*'; \
32+
echo 'Pin: release n=buster'; \
33+
echo 'Pin-Priority: 990'; \
34+
} > /etc/apt/preferences.d/argon-buster
35+
# Argon2-End
36+
1837
# dependencies required for running "phpize"
1938
# (see persistent deps below)
2039
ENV PHPIZE_DEPS \
@@ -106,7 +125,9 @@ RUN set -eux; \
106125
savedAptMark="$(apt-mark showmanual)"; \
107126
apt-get update; \
108127
apt-get install -y --no-install-recommends \
128+
# Argon2-Start
109129
libargon2-0-dev \
130+
# Argon2-End
110131
libcurl4-openssl-dev \
111132
libedit-dev \
112133
libsodium-dev \
@@ -148,8 +169,10 @@ RUN set -eux; \
148169
--enable-mbstring \
149170
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
150171
--enable-mysqlnd \
172+
# Argon2-Start
151173
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
152174
--with-password-argon2 \
175+
# Argon2-End
153176
# https://wiki.php.net/rfc/libsodium
154177
--with-sodium=shared \
155178
\

‎7.3-rc/stretch/zts/Dockerfile

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

18+
# Argon2-Start
19+
RUN set -eux; \
20+
{ \
21+
echo 'deb http://deb.debian.org/debian buster main'; \
22+
echo 'deb http://deb.debian.org/debian buster-updates main'; \
23+
echo 'deb http://security.debian.org buster/updates main'; \
24+
} >> /etc/apt/sources.list; \
25+
{ \
26+
echo 'Package: *'; \
27+
echo 'Pin: release n=buster'; \
28+
echo 'Pin-Priority: 100'; \
29+
} > /etc/apt/preferences.d/no-buster; \
30+
{ \
31+
echo 'Package: libargon2-0*'; \
32+
echo 'Pin: release n=buster'; \
33+
echo 'Pin-Priority: 990'; \
34+
} > /etc/apt/preferences.d/argon-buster
35+
# Argon2-End
36+
1837
# dependencies required for running "phpize"
1938
# (see persistent deps below)
2039
ENV PHPIZE_DEPS \
@@ -106,7 +125,9 @@ RUN set -eux; \
106125
savedAptMark="$(apt-mark showmanual)"; \
107126
apt-get update; \
108127
apt-get install -y --no-install-recommends \
128+
# Argon2-Start
109129
libargon2-0-dev \
130+
# Argon2-End
110131
libcurl4-openssl-dev \
111132
libedit-dev \
112133
libsodium-dev \
@@ -148,8 +169,10 @@ RUN set -eux; \
148169
--enable-mbstring \
149170
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
150171
--enable-mysqlnd \
172+
# Argon2-Start
151173
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
152174
--with-password-argon2 \
175+
# Argon2-End
153176
# https://wiki.php.net/rfc/libsodium
154177
--with-sodium=shared \
155178
\

0 commit comments

Comments
 (0)