Skip to content

Add libsodium to 7.2+ #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2018
Merged

Add libsodium to 7.2+ #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions 7.2/alpine3.6/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
Expand All @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.2/alpine3.6/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
Expand All @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.2/alpine3.6/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
Expand All @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.2/alpine3.7/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
Expand All @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.2/alpine3.7/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
Expand All @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.2/alpine3.7/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
Expand All @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.2/stretch/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ RUN set -eux; \
libargon2-0-dev \
libcurl4-openssl-dev \
libedit-dev \
libsodium-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.2/stretch/cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ RUN set -eux; \
libargon2-0-dev \
libcurl4-openssl-dev \
libedit-dev \
libsodium-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.2/stretch/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -eux; \
libargon2-0-dev \
libcurl4-openssl-dev \
libedit-dev \
libsodium-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions 7.2/stretch/zts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -eux; \
libargon2-0-dev \
libcurl4-openssl-dev \
libedit-dev \
libsodium-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ RUN set -xe \
curl-dev \
libedit-dev \
libressl-dev \
libsodium-dev \
libxml2-dev \
sqlite-dev \
\
Expand All @@ -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 \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ RUN set -eux; \
libargon2-0-dev \
libcurl4-openssl-dev \
libedit-dev \
libsodium-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 4 additions & 0 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down