Skip to content

Commit edf4f2f

Browse files
TimWollaTimWolla
committed
Enable argon2 for alpine 3.8+
1 parent 5d82c0b commit edf4f2f

File tree

13 files changed

+20
-51
lines changed

13 files changed

+20
-51
lines changed

‎7.2/stretch/apache/Dockerfile

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

18-
# Argon2-Start
1918
RUN set -eux; \
2019
{ \
2120
echo 'deb http://deb.debian.org/debian buster main'; \
@@ -32,7 +31,6 @@ RUN set -eux; \
3231
echo 'Pin: release n=buster'; \
3332
echo 'Pin-Priority: 990'; \
3433
} > /etc/apt/preferences.d/argon-buster
35-
# Argon2-End
3634

3735
# dependencies required for running "phpize"
3836
# (see persistent deps below)
@@ -183,9 +181,7 @@ RUN set -eux; \
183181
savedAptMark="$(apt-mark showmanual)"; \
184182
apt-get update; \
185183
apt-get install -y --no-install-recommends \
186-
# Argon2-Start
187184
libargon2-0-dev \
188-
# Argon2-End
189185
libcurl4-openssl-dev \
190186
libedit-dev \
191187
libsodium-dev \
@@ -227,10 +223,8 @@ RUN set -eux; \
227223
--enable-mbstring \
228224
# --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)
229225
--enable-mysqlnd \
230-
# Argon2-Start
231226
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
232227
--with-password-argon2 \
233-
# Argon2-End
234228
# https://wiki.php.net/rfc/libsodium
235229
--with-sodium=shared \
236230
\

‎7.2/stretch/cli/Dockerfile

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

18-
# Argon2-Start
1918
RUN set -eux; \
2019
{ \
2120
echo 'deb http://deb.debian.org/debian buster main'; \
@@ -32,7 +31,6 @@ RUN set -eux; \
3231
echo 'Pin: release n=buster'; \
3332
echo 'Pin-Priority: 990'; \
3433
} > /etc/apt/preferences.d/argon-buster
35-
# Argon2-End
3634

3735
# dependencies required for running "phpize"
3836
# (see persistent deps below)
@@ -124,9 +122,7 @@ RUN set -eux; \
124122
savedAptMark="$(apt-mark showmanual)"; \
125123
apt-get update; \
126124
apt-get install -y --no-install-recommends \
127-
# Argon2-Start
128125
libargon2-0-dev \
129-
# Argon2-End
130126
libcurl4-openssl-dev \
131127
libedit-dev \
132128
libsodium-dev \
@@ -168,10 +164,8 @@ RUN set -eux; \
168164
--enable-mbstring \
169165
# --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)
170166
--enable-mysqlnd \
171-
# Argon2-Start
172167
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
173168
--with-password-argon2 \
174-
# Argon2-End
175169
# https://wiki.php.net/rfc/libsodium
176170
--with-sodium=shared \
177171
\

‎7.2/stretch/fpm/Dockerfile

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

18-
# Argon2-Start
1918
RUN set -eux; \
2019
{ \
2120
echo 'deb http://deb.debian.org/debian buster main'; \
@@ -32,7 +31,6 @@ RUN set -eux; \
3231
echo 'Pin: release n=buster'; \
3332
echo 'Pin-Priority: 990'; \
3433
} > /etc/apt/preferences.d/argon-buster
35-
# Argon2-End
3634

3735
# dependencies required for running "phpize"
3836
# (see persistent deps below)
@@ -125,9 +123,7 @@ RUN set -eux; \
125123
savedAptMark="$(apt-mark showmanual)"; \
126124
apt-get update; \
127125
apt-get install -y --no-install-recommends \
128-
# Argon2-Start
129126
libargon2-0-dev \
130-
# Argon2-End
131127
libcurl4-openssl-dev \
132128
libedit-dev \
133129
libsodium-dev \
@@ -169,10 +165,8 @@ RUN set -eux; \
169165
--enable-mbstring \
170166
# --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)
171167
--enable-mysqlnd \
172-
# Argon2-Start
173168
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
174169
--with-password-argon2 \
175-
# Argon2-End
176170
# https://wiki.php.net/rfc/libsodium
177171
--with-sodium=shared \
178172
\

‎7.2/stretch/zts/Dockerfile

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

18-
# Argon2-Start
1918
RUN set -eux; \
2019
{ \
2120
echo 'deb http://deb.debian.org/debian buster main'; \
@@ -32,7 +31,6 @@ RUN set -eux; \
3231
echo 'Pin: release n=buster'; \
3332
echo 'Pin-Priority: 990'; \
3433
} > /etc/apt/preferences.d/argon-buster
35-
# Argon2-End
3634

3735
# dependencies required for running "phpize"
3836
# (see persistent deps below)
@@ -125,9 +123,7 @@ RUN set -eux; \
125123
savedAptMark="$(apt-mark showmanual)"; \
126124
apt-get update; \
127125
apt-get install -y --no-install-recommends \
128-
# Argon2-Start
129126
libargon2-0-dev \
130-
# Argon2-End
131127
libcurl4-openssl-dev \
132128
libedit-dev \
133129
libsodium-dev \
@@ -169,10 +165,8 @@ RUN set -eux; \
169165
--enable-mbstring \
170166
# --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)
171167
--enable-mysqlnd \
172-
# Argon2-Start
173168
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
174169
--with-password-argon2 \
175-
# Argon2-End
176170
# https://wiki.php.net/rfc/libsodium
177171
--with-sodium=shared \
178172
\

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ RUN set -xe \
9898
$PHPIZE_DEPS \
9999
coreutils \
100100
curl-dev \
101+
argon2-dev \
101102
libedit-dev \
102103
libressl-dev \
103104
libsodium-dev \
@@ -127,6 +128,8 @@ RUN set -xe \
127128
--enable-mbstring \
128129
# --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)
129130
--enable-mysqlnd \
131+
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
132+
--with-password-argon2 \
130133
# https://wiki.php.net/rfc/libsodium
131134
--with-sodium=shared \
132135
\

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ RUN set -xe \
9999
$PHPIZE_DEPS \
100100
coreutils \
101101
curl-dev \
102+
argon2-dev \
102103
libedit-dev \
103104
libressl-dev \
104105
libsodium-dev \
@@ -128,6 +129,8 @@ RUN set -xe \
128129
--enable-mbstring \
129130
# --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)
130131
--enable-mysqlnd \
132+
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
133+
--with-password-argon2 \
131134
# https://wiki.php.net/rfc/libsodium
132135
--with-sodium=shared \
133136
\

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ RUN set -xe \
9999
$PHPIZE_DEPS \
100100
coreutils \
101101
curl-dev \
102+
argon2-dev \
102103
libedit-dev \
103104
libressl-dev \
104105
libsodium-dev \
@@ -128,6 +129,8 @@ RUN set -xe \
128129
--enable-mbstring \
129130
# --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)
130131
--enable-mysqlnd \
132+
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
133+
--with-password-argon2 \
131134
# https://wiki.php.net/rfc/libsodium
132135
--with-sodium=shared \
133136
\

‎7.3-rc/stretch/apache/Dockerfile

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

18-
# Argon2-Start
1918
RUN set -eux; \
2019
{ \
2120
echo 'deb http://deb.debian.org/debian buster main'; \
@@ -32,7 +31,6 @@ RUN set -eux; \
3231
echo 'Pin: release n=buster'; \
3332
echo 'Pin-Priority: 990'; \
3433
} > /etc/apt/preferences.d/argon-buster
35-
# Argon2-End
3634

3735
# dependencies required for running "phpize"
3836
# (see persistent deps below)
@@ -183,9 +181,7 @@ RUN set -eux; \
183181
savedAptMark="$(apt-mark showmanual)"; \
184182
apt-get update; \
185183
apt-get install -y --no-install-recommends \
186-
# Argon2-Start
187184
libargon2-0-dev \
188-
# Argon2-End
189185
libcurl4-openssl-dev \
190186
libedit-dev \
191187
libsodium-dev \
@@ -227,10 +223,8 @@ RUN set -eux; \
227223
--enable-mbstring \
228224
# --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)
229225
--enable-mysqlnd \
230-
# Argon2-Start
231226
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
232227
--with-password-argon2 \
233-
# Argon2-End
234228
# https://wiki.php.net/rfc/libsodium
235229
--with-sodium=shared \
236230
\

‎7.3-rc/stretch/cli/Dockerfile

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

18-
# Argon2-Start
1918
RUN set -eux; \
2019
{ \
2120
echo 'deb http://deb.debian.org/debian buster main'; \
@@ -32,7 +31,6 @@ RUN set -eux; \
3231
echo 'Pin: release n=buster'; \
3332
echo 'Pin-Priority: 990'; \
3433
} > /etc/apt/preferences.d/argon-buster
35-
# Argon2-End
3634

3735
# dependencies required for running "phpize"
3836
# (see persistent deps below)
@@ -124,9 +122,7 @@ RUN set -eux; \
124122
savedAptMark="$(apt-mark showmanual)"; \
125123
apt-get update; \
126124
apt-get install -y --no-install-recommends \
127-
# Argon2-Start
128125
libargon2-0-dev \
129-
# Argon2-End
130126
libcurl4-openssl-dev \
131127
libedit-dev \
132128
libsodium-dev \
@@ -168,10 +164,8 @@ RUN set -eux; \
168164
--enable-mbstring \
169165
# --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)
170166
--enable-mysqlnd \
171-
# Argon2-Start
172167
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
173168
--with-password-argon2 \
174-
# Argon2-End
175169
# https://wiki.php.net/rfc/libsodium
176170
--with-sodium=shared \
177171
\

‎7.3-rc/stretch/fpm/Dockerfile

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

18-
# Argon2-Start
1918
RUN set -eux; \
2019
{ \
2120
echo 'deb http://deb.debian.org/debian buster main'; \
@@ -32,7 +31,6 @@ RUN set -eux; \
3231
echo 'Pin: release n=buster'; \
3332
echo 'Pin-Priority: 990'; \
3433
} > /etc/apt/preferences.d/argon-buster
35-
# Argon2-End
3634

3735
# dependencies required for running "phpize"
3836
# (see persistent deps below)
@@ -125,9 +123,7 @@ RUN set -eux; \
125123
savedAptMark="$(apt-mark showmanual)"; \
126124
apt-get update; \
127125
apt-get install -y --no-install-recommends \
128-
# Argon2-Start
129126
libargon2-0-dev \
130-
# Argon2-End
131127
libcurl4-openssl-dev \
132128
libedit-dev \
133129
libsodium-dev \
@@ -169,10 +165,8 @@ RUN set -eux; \
169165
--enable-mbstring \
170166
# --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)
171167
--enable-mysqlnd \
172-
# Argon2-Start
173168
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
174169
--with-password-argon2 \
175-
# Argon2-End
176170
# https://wiki.php.net/rfc/libsodium
177171
--with-sodium=shared \
178172
\

0 commit comments

Comments
 (0)