Merge pull request #581 from infosiftr/salty

tianon · web-flow · commit be08d2067c6c · 2018-02-06T09:12:02.000-08:00
Add libsodium to 7.2+
diff --git a/7.2/alpine3.6/cli/Dockerfile b/7.2/alpine3.6/cli/Dockerfile
@@ -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 \
diff --git a/7.2/alpine3.6/fpm/Dockerfile b/7.2/alpine3.6/fpm/Dockerfile
@@ -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 \
diff --git a/7.2/alpine3.6/zts/Dockerfile b/7.2/alpine3.6/zts/Dockerfile
@@ -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 \
diff --git a/7.2/alpine3.7/cli/Dockerfile b/7.2/alpine3.7/cli/Dockerfile
@@ -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 \
diff --git a/7.2/alpine3.7/fpm/Dockerfile b/7.2/alpine3.7/fpm/Dockerfile
@@ -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 \
diff --git a/7.2/alpine3.7/zts/Dockerfile b/7.2/alpine3.7/zts/Dockerfile
@@ -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 \
diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile
@@ -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 \
diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile
@@ -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 \
diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile
@@ -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 \
diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile
@@ -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 \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -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 \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -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 \
diff --git a/update.sh b/update.sh
@@ -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
