From 1d2d6121cfe809ac92009402dd4d68928cf97bc4 Mon Sep 17 00:00:00 2001
From: Tim Seagren <seagren.tim@solute.local>
Date: Mon, 10 Aug 2020 11:20:47 -0700
Subject: [PATCH] added mysql, mysql daemonset, zlib, openssl, and curl
 extensions for php

---
 Dockerfile    | 61 +++++++++++++++++++++++++++++++--------------------
 download.yaml |  5 +++++
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c3268e6..52697f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,16 +9,26 @@ ENV PHP_INI_PATH=/usr/local/etc/php
 COPY php.tar.gz /usr/local/src/
 COPY bison.tar.gz /
 COPY textinfo.tar.gz /
+COPY libsodium.tar.gz /
 
 RUN dnf update --setopt=tsflags=nodocs -y \
     && dnf install --setopt=tsflags=nodocs -y \ 
-		  gcc \
-		  make \
+      gcc \
+      make \
       libxml2-devel \
+      openssl-devel \
+      sqlite-devel \
+      curl-devel \
       autoconf \
       help2man \
-      sqlite-devel \
     && dnf clean all \
+    && mkdir -p /usr/src/libsodium \
+    && tar -zxf /libsodium.tar.gz --strip-components=1 -C /usr/src/libsodium \
+    && rm /libsodium.tar.gz \
+    && cd /usr/src/libsodium \
+    && ./configure \
+    && make \
+    && make install \
     && mkdir -p /usr/src/textinfo \
     && tar -zxf /textinfo.tar.gz --strip-components=1 -C /usr/src/textinfo \
     && rm /textinfo.tar.gz \
@@ -45,8 +55,13 @@ RUN dnf update --setopt=tsflags=nodocs -y \
        --with-config-file-path=${PHP_INI_PATH} \
        --with-config-file-scan-dir=${PHP_INI_PATH}/conf.d \
        --without-pear \
+       --with-mhash \
+       --with-curl \
+       --with-openssl \
+       --with-zlib \
        --with-pdo-sqlite=/usr \
-       --with-sqlite3=/usr \
+       --with-pdo-mysql=mysqlnd \
+       --with-sqlite3=/usr \ 
        --enable-fpm \
     && make -j4 \
     && make install \
@@ -62,33 +77,31 @@ LABEL org.opencontainers.image.title="php" \
       org.opencontainers.image.url="https://www.php.net/" \
       org.opencontainers.image.version="7.3.20" \
       maintainer="cht@dsop.io"
-
 ENV PHP_INI_PATH=/usr/local/etc/php
-
 RUN mkdir -p ${PHP_INI_PATH}/conf.d /usr/local/etc/php-fpm.d /usr/local/var/log/php-fpm \
     && chown -R 1001:1001 /usr/local/var/log/php-fpm/ \
     && { \ 
     echo '[global]'; \
-		echo 'error_log = /proc/self/fd/2'; \
-		echo; echo '; https://github.com/docker-library/php/pull/725#issuecomment-443540114'; echo 'log_limit = 8192'; \
-		echo; \
-		echo '[www]'; \
-		echo '; if we send this to /proc/self/fd/1, it never appears'; \
-		echo 'access.log = /proc/self/fd/2'; \
-		echo; \
-		echo 'clear_env = no'; \
-		echo; \
-		echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
-		echo 'catch_workers_output = yes'; \
-		echo 'decorate_workers_output = no'; \ 
+    echo 'error_log = /proc/self/fd/2'; \
+    echo; echo '; https://github.com/docker-library/php/pull/725#issuecomment-443540114'; echo 'log_limit = 8192'; \
+    echo; \
+    echo '[www]'; \
+    echo '; if we send this to /proc/self/fd/1, it never appears'; \
+    echo 'access.log = /proc/self/fd/2'; \
+    echo; \
+    echo 'clear_env = no'; \
+    echo; \
+    echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
+    echo 'catch_workers_output = yes'; \
+    echo 'decorate_workers_output = no'; \ 
     } | tee /usr/local/etc/php-fpm.d/docker.conf \
     && { \
-		echo '[global]'; \
-		echo 'daemonize = no'; \
-		echo; \
-		echo '[www]'; \
-		echo 'listen = 9000'; \
-	  } | tee /usr/local/etc/php-fpm.d/zz-docker.conf \
+    echo '[global]'; \
+    echo 'daemonize = no'; \
+    echo; \
+    echo '[www]'; \
+    echo 'listen = 9000'; \
+    } | tee /usr/local/etc/php-fpm.d/zz-docker.conf \
     && mkdir -p /var/www/html/ \
     && chown 1001:1001 /var/www/html \
     && chmod 777 /var/www/html \
diff --git a/download.yaml b/download.yaml
index f908d5e..d441c4e 100644
--- a/download.yaml
+++ b/download.yaml
@@ -4,6 +4,11 @@ resources:
     validation:
       type: "sha256"
       value: "4f9230b77230dfbe1b53776da207cf78458234440e29134561f1ba87d03c4d2b"
+  - url: "https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz"
+    filename: "libsodium.tar.gz"
+    validation:
+      type: "sha256"
+      value: "6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1"
   - url: "http://ftp.gnu.org/gnu/bison/bison-3.5.4.tar.gz"
     filename: "bison.tar.gz"
     validation:
-- 
GitLab