From b3dfa8438f6516e6d5930ef34e94bd9aeb77647f Mon Sep 17 00:00:00 2001
From: guler <gulervarol@gdu.com.tr>
Date: Fri, 14 Oct 2022 11:33:21 +0300
Subject: [PATCH] - added, PHP_DOWNGRADE_OPENSSL_TLS_VERSION - php-fpm added,
 apt-get update - workspace added, apt-get update

---
 .env.example         | 5 +++--
 docker-compose.yml   | 1 +
 php-fpm/Dockerfile   | 8 +++++---
 workspace/Dockerfile | 3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.env.example b/.env.example
index fcf07853..44051cc4 100644
--- a/.env.example
+++ b/.env.example
@@ -65,6 +65,9 @@ PHP_IDE_CONFIG=serverName=laradock
 
 PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=false
 
+# Accepted values: 1.2 - 1.1 - 1.0
+PHP_DOWNGRADE_OPENSSL_TLS_VERSION=1.2
+
 ### Windows Path ##########################################
 
 # A fix for Windows users, to ensure the application path works
@@ -895,7 +898,6 @@ MAILU_WEBMAIL=rainloop
 # Dav server implementation (value: radicale, none)
 MAILU_WEBDAV=radicale
 
-
 ### TRAEFIK #################################################
 
 TRAEFIK_HOST_HTTP_PORT=80
@@ -906,7 +908,6 @@ TRAEFIK_DASHBOARD_USER='admin:$2y$10$lXaL3lj6raFic6rFqr2.lOBoCudAIhB6zyoqObNg290
 ACME_DOMAIN=example.org
 ACME_EMAIL=email@example.org
 
-
 ### MOSQUITTO #################################################
 
 MOSQUITTO_PORT=9001
diff --git a/docker-compose.yml b/docker-compose.yml
index 74fb92c2..f2a644d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -279,6 +279,7 @@ services:
           - INSTALL_TRADER=${PHP_FPM_INSTALL_TRADER}
           - INSTALL_EVENT=${PHP_FPM_INSTALL_EVENT}
           - DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=${PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL}
+          - DOWNGRADE_OPENSSL_TLS_VERSION=${PHP_DOWNGRADE_OPENSSL_TLS_VERSION}
           - PUID=${PHP_FPM_PUID}
           - PGID=${PHP_FPM_PGID}
           - IMAGEMAGICK_VERSION=${PHP_FPM_IMAGEMAGICK_VERSION}
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 46ecbaf2..f949c9a8 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -737,8 +737,9 @@ RUN set -eux; \
       ###########################################################################
       # Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
       ###########################################################################
-      # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
-      apt-get install -yqq apt-transport-https gnupg lsb-release \
+      # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux \
+      apt-get update \
+      && apt-get install -yqq apt-transport-https gnupg lsb-release \
       && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
       && curl https://packages.microsoft.com/config/debian/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list \
       && apt-get update -yqq \
@@ -1210,9 +1211,10 @@ RUN set -xe; \
 ###########################################################################
 
 ARG DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=false
+ARG DOWNGRADE_OPENSSL_TLS_VERSION=1.2
 
 RUN if [ ${DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL} = true ]; then \
-    sed -i 's,^\(MinProtocol[ ]*=\).*,\1'TLSv1.2',g' /etc/ssl/openssl.cnf \
+    sed -i 's,^\(MinProtocol[ ]*=\).*,\1'TLSv${DOWNGRADE_OPENSSL_TLS_VERSION}',g' /etc/ssl/openssl.cnf \
     && \
     sed -i 's,^\(CipherString[ ]*=\).*,\1'DEFAULT@SECLEVEL=1',g' /etc/ssl/openssl.cnf\
 ;fi
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 5eee6679..99635734 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -533,7 +533,8 @@ RUN if [ ${INSTALL_GEARMAN} = true ]; then \
 ARG INSTALL_PHPREDIS=false
 
 RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
-    apt-get install -yqq php${LARADOCK_PHP_VERSION}-redis \
+    apt-get update \
+    && apt-get install -yqq php${LARADOCK_PHP_VERSION}-redis \
 ;fi
 
 ###########################################################################