danog/php
1
0
Fork 0
mirror of https://github.com/danog/php.git synced 2024-11-30 04:29:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add libsodium to 7.2+

Browse Source
This commit is contained in:
Joe Ferguson 2018-02-05 16:06:59 -08:00
parent b4e5b2b22a
commit fd8e15250a
13 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
7.2/alpine3.6/cli/Dockerfile
View File

@ -95,6 +95,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
@ -117,6 +118,8 @@ RUN set -xe \
--enable-mbstring \
# --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)
--enable-mysqlnd \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

3
7.2/alpine3.6/fpm/Dockerfile
View File

@ -96,6 +96,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
@ -118,6 +119,8 @@ RUN set -xe \
--enable-mbstring \
# --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)
--enable-mysqlnd \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

3
7.2/alpine3.6/zts/Dockerfile
View File

@ -96,6 +96,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
@ -118,6 +119,8 @@ RUN set -xe \
--enable-mbstring \
# --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)
--enable-mysqlnd \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

3
7.2/alpine3.7/cli/Dockerfile
View File

@ -95,6 +95,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
@ -117,6 +118,8 @@ RUN set -xe \
--enable-mbstring \
# --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)
--enable-mysqlnd \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

3
7.2/alpine3.7/fpm/Dockerfile
View File

@ -96,6 +96,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
@ -118,6 +119,8 @@ RUN set -xe \
--enable-mbstring \
# --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)
--enable-mysqlnd \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

3
7.2/alpine3.7/zts/Dockerfile
View File

@ -96,6 +96,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
@ -118,6 +119,8 @@ RUN set -xe \
--enable-mbstring \
# --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)
--enable-mysqlnd \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

3
7.2/stretch/apache/Dockerfile
View File

@ -163,6 +163,7 @@ RUN set -eux; \
libargon2-0-dev \
libcurl4-openssl-dev \
libedit-dev \
libsodium-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
@ -199,6 +200,8 @@ RUN set -eux; \
--enable-mysqlnd \
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
--with-password-argon2 \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

3
7.2/stretch/cli/Dockerfile
View File

@ -104,6 +104,7 @@ RUN set -eux; \
libargon2-0-dev \
libcurl4-openssl-dev \
libedit-dev \
libsodium-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
@ -140,6 +141,8 @@ RUN set -eux; \
--enable-mysqlnd \
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
--with-password-argon2 \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

3
7.2/stretch/fpm/Dockerfile
View File

@ -105,6 +105,7 @@ RUN set -eux; \
libargon2-0-dev \
libcurl4-openssl-dev \
libedit-dev \
libsodium-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
@ -141,6 +142,8 @@ RUN set -eux; \
--enable-mysqlnd \
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
--with-password-argon2 \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

3
7.2/stretch/zts/Dockerfile
View File

@ -105,6 +105,7 @@ RUN set -eux; \
libargon2-0-dev \
libcurl4-openssl-dev \
libedit-dev \
libsodium-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
@ -141,6 +142,8 @@ RUN set -eux; \
--enable-mysqlnd \
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
--with-password-argon2 \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

3
Dockerfile-alpine.template
View File

@ -89,6 +89,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
@ -111,6 +112,8 @@ RUN set -xe \
--enable-mbstring \
# --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)
--enable-mysqlnd \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

3
Dockerfile-debian.template
View File

@ -98,6 +98,7 @@ RUN set -eux; \
libargon2-0-dev \
libcurl4-openssl-dev \
libedit-dev \
libsodium-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
@ -134,6 +135,8 @@ RUN set -eux; \
--enable-mysqlnd \
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
--with-password-argon2 \
# https://wiki.php.net/rfc/libsodium
--with-sodium \
\
--with-curl \
--with-libedit \

4
update.sh
View File

@ -161,6 +161,10 @@ for version in "${versions[@]}"; do
sed -ri '/argon2/d' "$version/$suite/$variant/Dockerfile"
# Alpine 3.7+ _should_ include an "argon2-dev" package, but we should cross that bridge when we come to it
fi
if [ "$majorVersion" = '5' ] || [ "$majorVersion" = '7' -a "$minorVersion" -lt '2' ]; then
# sodium is part of php core 7.2+ https://wiki.php.net/rfc/libsodium
sed -ri '/sodium/d' "$version/$suite/$variant/Dockerfile"
fi
# automatic `-slim` for stretch
# TODO always add slim once jessie is removed