From fb9e1c6f4f04f082cdf781f3cdcdc9d9e3667d28 Mon Sep 17 00:00:00 2001
From: dimti <demidov@dimti.ru>
Date: Thu, 15 Apr 2021 22:26:34 +0300
Subject: [PATCH] - remove rename php.ini-development from user space build -
 temporary disable igbinary, because install not successfully completed with
 segmentation fault * partition of tune opts semantically divided - remove
 unused env-vars from docker compose base in src and user space builds

---
 docker-compose.base.yml                      |  7 -------
 dockerfiles/php-fpm/php73.Dockerfile         |  5 +----
 dockerfiles/php-fpm/php74.Dockerfile         |  5 +----
 dockerfiles/workspace/workspace74.Dockerfile |  4 ++--
 src/docker-compose.base.yml                  | 12 ------------
 src/dockerfiles/php-fpm/php.base.Dockerfile  |  4 ++++
 6 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index ecc1592..5c64249 100755
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -22,13 +22,6 @@ services:
     build:
       context: ./dockerfiles/php-fpm
       args:
-        - INSTALL_XDEBUG=${INSTALL_XDEBUG}
-        - INSTALL_REDIS=${INSTALL_REDIS}
-        - INSTALL_ZIP=${INSTALL_ZIP}
-        - INSTALL_BZ2=${INSTALL_BZ2}
-        - INSTALL_INTL=${INSTALL_INTL}
-        - INSTALL_PGSQL=${INSTALL_PGSQL}
-        - INSTALL_BCMATH=${INSTALL_BCMATH}
         - INSTALL_PEAR_MAIL=${INSTALL_PEAR_MAIL}
         - PHP_OPT_SHORT_OPEN_TAG=${PHP_OPT_SHORT_OPEN_TAG}
         - PHP_OPT_MAX_EXECUTION_TIME=${PHP_OPT_MAX_EXECUTION_TIME}
diff --git a/dockerfiles/php-fpm/php73.Dockerfile b/dockerfiles/php-fpm/php73.Dockerfile
index a4cded5..bed97cb 100644
--- a/dockerfiles/php-fpm/php73.Dockerfile
+++ b/dockerfiles/php-fpm/php73.Dockerfile
@@ -26,12 +26,9 @@ RUN if [ ${INSTALL_PEAR_MAIL} = true ]; then \
 ;fi
 
 ###########################################################################
-# php.ini opts:
+# Tune opts:
 ###########################################################################
 
-# https://github.com/php/php-src/blob/master/php.ini-development
-RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
-
 ARG PHP_OPT_SHORT_OPEN_TAG=Off
 RUN sed -i "s/^short_open_tag = .*/short_open_tag = $PHP_OPT_SHORT_OPEN_TAG/g" "$PHP_INI_DIR/php.ini"
 
diff --git a/dockerfiles/php-fpm/php74.Dockerfile b/dockerfiles/php-fpm/php74.Dockerfile
index 482b7cd..f833009 100644
--- a/dockerfiles/php-fpm/php74.Dockerfile
+++ b/dockerfiles/php-fpm/php74.Dockerfile
@@ -26,12 +26,9 @@ RUN if [ ${INSTALL_PEAR_MAIL} = true ]; then \
 ;fi
 
 ###########################################################################
-# php.ini opts:
+# Tune opts:
 ###########################################################################
 
-# https://github.com/php/php-src/blob/master/php.ini-development
-RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
-
 ARG PHP_OPT_SHORT_OPEN_TAG=Off
 RUN sed -i "s/^short_open_tag = .*/short_open_tag = $PHP_OPT_SHORT_OPEN_TAG/g" "$PHP_INI_DIR/php.ini"
 
diff --git a/dockerfiles/workspace/workspace74.Dockerfile b/dockerfiles/workspace/workspace74.Dockerfile
index 82eeeca..2def86b 100644
--- a/dockerfiles/workspace/workspace74.Dockerfile
+++ b/dockerfiles/workspace/workspace74.Dockerfile
@@ -26,8 +26,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # Additional PHP-extensions:
 ###########################################################################
 
-RUN pecl install igbinary \
-    && pecl install -a redis
+#RUN pecl install igbinary && pecl install -a redis
+RUN pecl install -a redis
 
 ###########################################################################
 # S3 config
diff --git a/src/docker-compose.base.yml b/src/docker-compose.base.yml
index aae5bd9..5d7748e 100755
--- a/src/docker-compose.base.yml
+++ b/src/docker-compose.base.yml
@@ -6,22 +6,15 @@ services:
       context: ./dockerfiles/php-fpm
       args:
         - INSTALL_XDEBUG=${INSTALL_XDEBUG}
-        - INSTALL_REDIS=${INSTALL_REDIS}
         - INSTALL_ZIP=${INSTALL_ZIP}
         - INSTALL_BZ2=${INSTALL_BZ2}
         - INSTALL_INTL=${INSTALL_INTL}
         - INSTALL_PGSQL=${INSTALL_PGSQL}
         - INSTALL_BCMATH=${INSTALL_BCMATH}
-        - INSTALL_PEAR_MAIL=${INSTALL_PEAR_MAIL}
         - PHP_OPT_SHORT_OPEN_TAG=${PHP_OPT_SHORT_OPEN_TAG}
         - PHP_OPT_MAX_EXECUTION_TIME=${PHP_OPT_MAX_EXECUTION_TIME}
         - PHP_OPT_MEMORY_LIMIT=${PHP_OPT_MEMORY_LIMIT}
         - PHP_OPT_UPLOAD_MAX_FILESIZE=${PHP_OPT_UPLOAD_MAX_FILESIZE}
-    restart: always
-    volumes:
-      - ${PROJECTS_DIR}:/usr/share/nginx/html
-    expose:
-      - 9000
   workspace:
     build:
       context: ./dockerfiles/workspace
@@ -46,8 +39,3 @@ services:
         - INSTALL_GULP=${WORKSPACE_INSTALL_GULP}
         - INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
         - YARN_VERSION=${WORKSPACE_YARN_VERSION}
-    restart: always
-    volumes:
-      - ${PROJECTS_DIR}:/var/www
-    extra_hosts:
-      - "dockerhost:${DOCKER_HOST_IP}"
diff --git a/src/dockerfiles/php-fpm/php.base.Dockerfile b/src/dockerfiles/php-fpm/php.base.Dockerfile
index fb257ad..692e834 100644
--- a/src/dockerfiles/php-fpm/php.base.Dockerfile
+++ b/src/dockerfiles/php-fpm/php.base.Dockerfile
@@ -102,6 +102,10 @@ RUN sed -i "s/^log_limit = .*/log_limit = 1024/g" "$PHP_INI_DIR/../php-fpm.d/doc
 # https://github.com/php/php-src/blob/master/php.ini-development
 RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
 
+###########################################################################
+# Tune opts:
+###########################################################################
+
 ARG PHP_OPT_SHORT_OPEN_TAG=Off
 RUN sed -i "s/^short_open_tag = .*/short_open_tag = $PHP_OPT_SHORT_OPEN_TAG/g" "$PHP_INI_DIR/php.ini"