Merge pull request #22 from magento-commerce/imported-magento-magento-cloud-docker-298

BaDos · web-flow · commit 3b4357749740 · 2021-01-28T16:59:10.000-06:00
diff --git a/images/php/7.2-fpm/Dockerfile b/images/php/7.2-fpm/Dockerfile
@@ -9,7 +9,6 @@ ENV MAGENTO_RUN_MODE production
 ENV UPLOAD_MAX_FILESIZE 64M
 ENV UPDATE_UID_GID false
 ENV ENABLE_SENDMAIL true
-ENV SET_DOCKER_HOST false
 
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
@@ -21,6 +20,7 @@ RUN apt-get update \
   sendmail-bin \
   sendmail \
   sudo \
+  iproute2 \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
diff --git a/images/php/7.2-fpm/docker-entrypoint.sh b/images/php/7.2-fpm/docker-entrypoint.sh
@@ -61,11 +61,12 @@ fi
 # Configure PHP-FPM
 [ ! -z "${MAGENTO_RUN_MODE}" ] && sed -i "s/!MAGENTO_RUN_MODE!/${MAGENTO_RUN_MODE}/" /usr/local/etc/php-fpm.conf
 
-# Set host.docker.inernal for LINUX os
-if [[ "$SET_DOCKER_HOST" = "true" ]]; then
-  apt update
-  apt install -y iproute2
-  echo -e "`/sbin/ip route|awk '/default/ { print $3 }'`\thost.docker.internal" | sudo tee -a /etc/hosts > /dev/null
+# Set host.docker.inernal if not available
+HOST_NAME="host.docker.internal"
+HOST_IP=$(php -r "putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); echo gethostbyname('$HOST_NAME');")
+if [[ "$HOST_IP" == "$HOST_NAME" ]]; then
+  HOST_IP=$(/sbin/ip route|awk '/default/ { print $3 }')
+  printf "\n%s %s\n" "$HOST_IP" "$HOST_NAME" >> /etc/hosts
 fi
 
 exec "$@"
diff --git a/images/php/7.3-fpm/Dockerfile b/images/php/7.3-fpm/Dockerfile
@@ -9,7 +9,6 @@ ENV MAGENTO_RUN_MODE production
 ENV UPLOAD_MAX_FILESIZE 64M
 ENV UPDATE_UID_GID false
 ENV ENABLE_SENDMAIL true
-ENV SET_DOCKER_HOST false
 
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
@@ -21,6 +20,7 @@ RUN apt-get update \
   sendmail-bin \
   sendmail \
   sudo \
+  iproute2 \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
diff --git a/images/php/7.3-fpm/docker-entrypoint.sh b/images/php/7.3-fpm/docker-entrypoint.sh
@@ -61,11 +61,12 @@ fi
 # Configure PHP-FPM
 [ ! -z "${MAGENTO_RUN_MODE}" ] && sed -i "s/!MAGENTO_RUN_MODE!/${MAGENTO_RUN_MODE}/" /usr/local/etc/php-fpm.conf
 
-# Set host.docker.inernal for LINUX os
-if [[ "$SET_DOCKER_HOST" = "true" ]]; then
-  apt update
-  apt install -y iproute2
-  echo -e "`/sbin/ip route|awk '/default/ { print $3 }'`\thost.docker.internal" | sudo tee -a /etc/hosts > /dev/null
+# Set host.docker.inernal if not available
+HOST_NAME="host.docker.internal"
+HOST_IP=$(php -r "putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); echo gethostbyname('$HOST_NAME');")
+if [[ "$HOST_IP" == "$HOST_NAME" ]]; then
+  HOST_IP=$(/sbin/ip route|awk '/default/ { print $3 }')
+  printf "\n%s %s\n" "$HOST_IP" "$HOST_NAME" >> /etc/hosts
 fi
 
 exec "$@"
diff --git a/images/php/7.4-fpm/Dockerfile b/images/php/7.4-fpm/Dockerfile
@@ -9,7 +9,6 @@ ENV MAGENTO_RUN_MODE production
 ENV UPLOAD_MAX_FILESIZE 64M
 ENV UPDATE_UID_GID false
 ENV ENABLE_SENDMAIL true
-ENV SET_DOCKER_HOST false
 
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
@@ -21,6 +20,7 @@ RUN apt-get update \
   sendmail-bin \
   sendmail \
   sudo \
+  iproute2 \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
diff --git a/images/php/7.4-fpm/docker-entrypoint.sh b/images/php/7.4-fpm/docker-entrypoint.sh
@@ -61,11 +61,12 @@ fi
 # Configure PHP-FPM
 [ ! -z "${MAGENTO_RUN_MODE}" ] && sed -i "s/!MAGENTO_RUN_MODE!/${MAGENTO_RUN_MODE}/" /usr/local/etc/php-fpm.conf
 
-# Set host.docker.inernal for LINUX os
-if [[ "$SET_DOCKER_HOST" = "true" ]]; then
-  apt update
-  apt install -y iproute2
-  echo -e "`/sbin/ip route|awk '/default/ { print $3 }'`\thost.docker.internal" | sudo tee -a /etc/hosts > /dev/null
+# Set host.docker.inernal if not available
+HOST_NAME="host.docker.internal"
+HOST_IP=$(php -r "putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); echo gethostbyname('$HOST_NAME');")
+if [[ "$HOST_IP" == "$HOST_NAME" ]]; then
+  HOST_IP=$(/sbin/ip route|awk '/default/ { print $3 }')
+  printf "\n%s %s\n" "$HOST_IP" "$HOST_NAME" >> /etc/hosts
 fi
 
 exec "$@"
diff --git a/images/php/fpm/Dockerfile b/images/php/fpm/Dockerfile
@@ -9,7 +9,6 @@ ENV MAGENTO_RUN_MODE production
 ENV UPLOAD_MAX_FILESIZE 64M
 ENV UPDATE_UID_GID false
 ENV ENABLE_SENDMAIL true
-ENV SET_DOCKER_HOST false
 
 {%env_php_extensions%}
 
diff --git a/images/php/fpm/docker-entrypoint.sh b/images/php/fpm/docker-entrypoint.sh
@@ -61,11 +61,12 @@ fi
 # Configure PHP-FPM
 [ ! -z "${MAGENTO_RUN_MODE}" ] && sed -i "s/!MAGENTO_RUN_MODE!/${MAGENTO_RUN_MODE}/" /usr/local/etc/php-fpm.conf
 
-# Set host.docker.inernal for LINUX os
-if [[ "$SET_DOCKER_HOST" = "true" ]]; then
-  apt update
-  apt install -y iproute2
-  echo -e "`/sbin/ip route|awk '/default/ { print $3 }'`\thost.docker.internal" | sudo tee -a /etc/hosts > /dev/null
+# Set host.docker.inernal if not available
+HOST_NAME="host.docker.internal"
+HOST_IP=$(php -r "putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); echo gethostbyname('$HOST_NAME');")
+if [[ "$HOST_IP" == "$HOST_NAME" ]]; then
+  HOST_IP=$(/sbin/ip route|awk '/default/ { print $3 }')
+  printf "\n%s %s\n" "$HOST_IP" "$HOST_NAME" >> /etc/hosts
 fi
 
 exec "$@"
diff --git a/src/Command/BuildCompose.php b/src/Command/BuildCompose.php
@@ -187,7 +187,7 @@ protected function configure(): void
                 Source\CliSource::OPTION_SET_DOCKER_HOST_XDEBUG,
                 null,
                 InputOption::VALUE_NONE,
-                'Sets host.docker.internal for fpm_xdebug container to resolve debug issue for LINUX system'
+                'Deprecated option to resolve host.docker.internal on Linux. Did nothing at the moment'
             )->addOption(
                 Source\CliSource::OPTION_NGINX_WORKER_PROCESSES,
                 null,
diff --git a/src/Command/Image/GeneratePhp.php b/src/Command/Image/GeneratePhp.php
@@ -36,7 +36,8 @@ class GeneratePhp extends Command
         'apt-utils',
         'sendmail-bin',
         'sendmail',
-        'sudo'
+        'sudo',
+        'iproute2'
     ];
     private const DEFAULT_PACKAGES_PHP_CLI = [
         'apt-utils',
diff --git a/src/Compose/ProductionBuilder/Service/FpmXdebug.php b/src/Compose/ProductionBuilder/Service/FpmXdebug.php
@@ -84,9 +84,6 @@ public function getConfig(Config $config): array
         $envVariables = [
             'PHP_EXTENSIONS' => implode(' ', array_unique(array_merge($this->phpExtension->get($config), ['xdebug'])))
         ];
-        if ($config->get(SourceInterface::SYSTEM_SET_DOCKER_HOST)) {
-            $envVariables['SET_DOCKER_HOST'] = true;
-        }
 
         return $this->serviceFactory->create(
             $this->getServiceName(),
diff --git a/src/Config/Source/CliSource.php b/src/Config/Source/CliSource.php
@@ -58,10 +58,14 @@ class CliSource implements SourceInterface
     public const OPTION_NO_TMP_MOUNTS = 'no-tmp-mounts';
     public const OPTION_SYNC_ENGINE = 'sync-engine';
     public const OPTION_WITH_XDEBUG = 'with-xdebug';
-    public const OPTION_SET_DOCKER_HOST_XDEBUG = 'set-docker-host';
     public const OPTION_WITH_ENTRYPOINT = 'with-entrypoint';
     public const OPTION_WITH_MARIADB_CONF = 'with-mariadb-conf';
 
+    /**
+     * @deprecated Will be removed in next major release
+     */
+    public const OPTION_SET_DOCKER_HOST_XDEBUG = 'set-docker-host';
+
     /**
      * Environment variables.
      */
@@ -254,10 +258,6 @@ public function read(): Repository
             ]);
         }
 
-        if ($this->input->getOption(self::OPTION_SET_DOCKER_HOST_XDEBUG)) {
-            $repository->set(self::SYSTEM_SET_DOCKER_HOST, true);
-        }
-
         if ($envs = $this->input->getOption(self::OPTION_ENV_VARIABLES)) {
             $repository->set(self::VARIABLES, (array)json_decode($envs, true));
         }
diff --git a/src/Config/Source/SourceInterface.php b/src/Config/Source/SourceInterface.php
@@ -147,7 +147,6 @@ interface SourceInterface
     public const SYSTEM_EXPOSE_DB_SALES_PORTS = 'system.expose_db_sales_ports';
     public const SYSTEM_DB_ENTRYPOINT = 'system.db_entrypoint';
     public const SYSTEM_MARIADB_CONF = 'system.mariadb_conf';
-    public const SYSTEM_SET_DOCKER_HOST = 'system.set_docker_host';
     public const SYSTEM_MAILHOG_SMTP_PORT = 'system.mailhog.smtp_port';
     public const SYSTEM_MAILHOG_HTTP_PORT = 'system.mailhog.http_port';
     public const SYSTEM_NGINX_WORKER_PROCESSES = 'system.nginx.worker_processes';
