summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2020-11-24 22:54:44 +0100
committerlookshe <github@lookshe.org>2020-11-24 22:54:44 +0100
commit009cd7e2061a858e128562f7f8e61935e72083a1 (patch)
treeeb428e5229b8ec9fec6f4dcecbf8e258de99b620
parente52808ec488874a526b144a62265bb4e004e29f4 (diff)
add sodium
-rw-r--r--php-7.4-opt/.copy.Dockerfile.swpbin0 -> 12288 bytes
-rw-r--r--php-7.4-opt/build.Dockerfile7
-rw-r--r--php-7.4-opt/copy.Dockerfile1
3 files changed, 8 insertions, 0 deletions
diff --git a/php-7.4-opt/.copy.Dockerfile.swp b/php-7.4-opt/.copy.Dockerfile.swp
new file mode 100644
index 0000000..4e03dcf
--- /dev/null
+++ b/php-7.4-opt/.copy.Dockerfile.swp
Binary files differ
diff --git a/php-7.4-opt/build.Dockerfile b/php-7.4-opt/build.Dockerfile
index 5ebcf80..ebef905 100644
--- a/php-7.4-opt/build.Dockerfile
+++ b/php-7.4-opt/build.Dockerfile
@@ -80,6 +80,12 @@ RUN cd libgd-2.1.1 \
&& ./configure --prefix=$DEP_PREFIX \
&& make \
&& checkinstall -y --pkgname $PACKAGE_NAME-libgd
+RUN curl https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz > libsodium-1.0.18.tar.gz
+RUN tar xzf libsodium-1.0.18.tar.gz
+RUN cd libsodium-1.0.18 \
+ && ./configure --prefix=$DEP_PREFIX \
+ && make \
+ && checkinstall -y --pkgname $PACKAGE_NAME-libsodium
RUN wget https://www.php.net/distributions/php-7.4.12.tar.gz
RUN tar xzf php-7.4.12.tar.gz
RUN cd php-7.4.12 \
@@ -124,6 +130,7 @@ RUN cd php-7.4.12 \
--with-pdo-mysql \
--with-pdo-sqlite \
--with-pear \
+ --with-sodium \
--with-sqlite3 \
--with-tidy \
--with-xmlrpc \
diff --git a/php-7.4-opt/copy.Dockerfile b/php-7.4-opt/copy.Dockerfile
index e240d0f..01f5f75 100644
--- a/php-7.4-opt/copy.Dockerfile
+++ b/php-7.4-opt/copy.Dockerfile
@@ -10,4 +10,5 @@ COPY --from=build-stage /libjpeg-turbo-2.0.6/build/php-7.4.12-opt-libjpeg-turbo_
COPY --from=build-stage /krb5-1.17.2/src/php-7.4.12-opt-krb5_1-1_amd64.deb .
COPY --from=build-stage /php-7.4.12/ext/imagick-3.4.4/php-7.4.12-opt-imagick_3.4.4-1_amd64.deb .
COPY --from=build-stage /php-7.4.12/ext/apcu-5.1.19/php-7.4.12-opt-apcu_5.1.19-1_amd64.deb .
+COPY --from=build-stage /libsodium-1.0.18/php-7.4.12-opt-libsodium_1.0.18-1_amd64.deb .