From f599be8854deb7c6e57495cd57df35edc5057f0a Mon Sep 17 00:00:00 2001
From: Yaroslav Mokhurenko <yaroslavmo@softwareplanet.uk.com>
Date: Wed, 3 Feb 2021 13:50:59 +0200
Subject: [PATCH] DP-252 Upgrade df-docker-base image

- Upgrade PHP to 7.3
---
 Dockerfile           |  2 +-
 README.md            |  2 +-
 docker-entrypoint.sh | 14 +++++++-------
 dreamfactory.conf    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7866ce9..ab66f56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM dreamfactorysoftware/df-base-img:develop
+FROM dreamfactorysoftware/df-base-img:php7.3
 
 # Configure Nginx
 COPY dreamfactory.conf /etc/nginx/sites-available/dreamfactory.conf
diff --git a/README.md b/README.md
index 5d46099..f39bceb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # df-docker
 
-Docker container for DreamFactory 4.x using Ubuntu 16.04, PHP 7.2 and NGINX.
+Docker container for DreamFactory 4.x using Ubuntu 16.04, PHP 7.3 and NGINX.
 
 ## Prerequisites
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index f8cd1cc..3ae90a1 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -15,11 +15,11 @@ done
 
 # Configure NGINX and www.conf
 ln -s /etc/nginx/sites-available/dreamfactory.conf /etc/nginx/sites-enabled/dreamfactory.conf && \
-sed -i "s/pm.max_children = 5/pm.max_children = 5000/" /etc/php/7.2/fpm/pool.d/www.conf && \
-sed -i "s/pm.start_servers = 2/pm.start_servers = 150/" /etc/php/7.2/fpm/pool.d/www.conf && \
-sed -i "s/pm.min_spare_servers = 1/pm.min_spare_servers = 100/" /etc/php/7.2/fpm/pool.d/www.conf && \
-sed -i "s/pm.max_spare_servers = 3/pm.max_spare_servers = 200/" /etc/php/7.2/fpm/pool.d/www.conf && \
-sed -i "s/pm = dynamic/pm = ondemand/" /etc/php/7.2/fpm/pool.d/www.conf && \
+sed -i "s/pm.max_children = 5/pm.max_children = 5000/" /etc/php/7.3/fpm/pool.d/www.conf && \
+sed -i "s/pm.start_servers = 2/pm.start_servers = 150/" /etc/php/7.3/fpm/pool.d/www.conf && \
+sed -i "s/pm.min_spare_servers = 1/pm.min_spare_servers = 100/" /etc/php/7.3/fpm/pool.d/www.conf && \
+sed -i "s/pm.max_spare_servers = 3/pm.max_spare_servers = 200/" /etc/php/7.3/fpm/pool.d/www.conf && \
+sed -i "s/pm = dynamic/pm = ondemand/" /etc/php/7.3/fpm/pool.d/www.conf && \
 sed -i "s/worker_connections 768;/worker_connections 2048;/" /etc/nginx/nginx.conf && \
 sed -i "s/keepalive_timeout 65;/keepalive_timeout 10;/" /etc/nginx/nginx.conf
 
@@ -187,8 +187,8 @@ if [ -n "$SENDMAIL_DEFAULT_COMMAND" ]; then
   sed -i "s/#SENDMAIL_DEFAULT_COMMAND=.*/SENDMAIL_DEFAULT_COMMAND=\"$(echo "$SENDMAIL_DEFAULT_COMMAND" | sed 's/\//\\\//g')\"/" .env
 fi
 
-# start php7.2-fpm
-service php7.2-fpm start
+# start php7.3-fpm
+service php7.3-fpm start
 
 # start cron service for df-scheduler
 service cron start
diff --git a/dreamfactory.conf b/dreamfactory.conf
index 955d8b5..ae8d56f 100644
--- a/dreamfactory.conf
+++ b/dreamfactory.conf
@@ -1,5 +1,5 @@
 upstream php_handler {
-    server unix:/var/run/php/php7.2-fpm.sock;
+    server unix:/var/run/php/php7.3-fpm.sock;
     #server 127.0.0.1:9000 backup;
 }