Merge branch 'develop' into MAGECLOUD-5112

oshmyheliuk · web-flow · commit 2dfc27704b10 · 2020-01-29T10:44:05.000-06:00
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-docker",
     "description": "Magento Cloud Docker",
     "type": "magento2-component",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/dist/mutagen.sh b/dist/mutagen.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+mutagen terminate --label-selector=magento-docker
+mutagen terminate --label-selector=magento-docker-vendor
+
 mutagen create \
        --label=magento-docker \
        --sync-mode=two-way-resolved \
@@ -8,10 +11,19 @@ mutagen create \
        --ignore=/.magento \
        --ignore=/.docker \
        --ignore=/.github \
+       --ignore=/vendor \
        --ignore=*.sql \
        --ignore=*.gz \
        --ignore=*.zip \
        --ignore=*.bz2 \
        --ignore-vcs \
        --symlink-mode=posix-raw \
        ./ docker://$(docker-compose ps -q fpm|awk '{print $1}')/app
+
+mutagen create \
+       --label=magento-docker-vendor \
+       --sync-mode=two-way-resolved \
+       --default-file-mode=0644 \
+       --default-directory-mode=0755 \
+       --symlink-mode=posix-raw \
+       ./vendor docker://$(docker-compose ps -q fpm|awk '{print $1}')/app/vendor
diff --git a/images/elasticsearch/1.7/Dockerfile b/images/elasticsearch/1.7/Dockerfile
@@ -4,4 +4,8 @@ RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elas
 RUN plugin --install elasticsearch/elasticsearch-analysis-icu/2.7.0 && \
     plugin --install elasticsearch/elasticsearch-analysis-phonetic/2.7.0
 
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+
+HEALTHCHECK --retries=3 CMD ["sh", "/docker-healthcheck.sh"]
+
 EXPOSE 9200 9300
diff --git a/images/elasticsearch/1.7/docker-healthcheck.sh b/images/elasticsearch/1.7/docker-healthcheck.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if health="$(curl -fsSL "http://${ES_HOST:-elasticsearch}:${ES_PORT:-9200}/_cat/health?h=status")"; then
+  health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
+  if [ "$health" = 'green' ] || [ "$health" = 'yellow' ]; then
+    exit 0
+  fi
+  echo >&2 "Unexpected health status: $health"
+fi
+
+exit 1
diff --git a/images/elasticsearch/2.4/Dockerfile b/images/elasticsearch/2.4/Dockerfile
@@ -4,4 +4,8 @@ RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elas
 RUN bin/plugin install analysis-icu && \
     bin/plugin install analysis-phonetic
 
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+
+HEALTHCHECK --retries=3 CMD ["sh", "/docker-healthcheck.sh"]
+
 EXPOSE 9200 9300
diff --git a/images/elasticsearch/2.4/docker-healthcheck.sh b/images/elasticsearch/2.4/docker-healthcheck.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if health="$(curl -fsSL "http://${ES_HOST:-elasticsearch}:${ES_PORT:-9200}/_cat/health?h=status")"; then
+  health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
+  if [ "$health" = 'green' ] || [ "$health" = 'yellow' ]; then
+    exit 0
+  fi
+  echo >&2 "Unexpected health status: $health"
+fi
+
+exit 1
diff --git a/images/elasticsearch/5.2/Dockerfile b/images/elasticsearch/5.2/Dockerfile
@@ -4,4 +4,8 @@ RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elas
 RUN bin/elasticsearch-plugin install analysis-icu && \
     bin/elasticsearch-plugin install analysis-phonetic
 
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+
+HEALTHCHECK --retries=3 CMD ["sh", "/docker-healthcheck.sh"]
+
 EXPOSE 9200 9300
diff --git a/images/elasticsearch/5.2/docker-healthcheck.sh b/images/elasticsearch/5.2/docker-healthcheck.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if health="$(curl -fsSL "http://${ES_HOST:-elasticsearch}:${ES_PORT:-9200}/_cat/health?h=status")"; then
+  health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
+  if [ "$health" = 'green' ] || [ "$health" = 'yellow' ]; then
+    exit 0
+  fi
+  echo >&2 "Unexpected health status: $health"
+fi
+
+exit 1
diff --git a/images/elasticsearch/6.5/Dockerfile b/images/elasticsearch/6.5/Dockerfile
@@ -4,4 +4,8 @@ RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elas
 RUN bin/elasticsearch-plugin install analysis-icu && \
     bin/elasticsearch-plugin install analysis-phonetic
 
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+
+HEALTHCHECK --retries=3 CMD ["sh", "/docker-healthcheck.sh"]
+
 EXPOSE 9200 9300
diff --git a/images/elasticsearch/6.5/docker-healthcheck.sh b/images/elasticsearch/6.5/docker-healthcheck.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if health="$(curl -fsSL "http://${ES_HOST:-elasticsearch}:${ES_PORT:-9200}/_cat/health?h=status")"; then
+  health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
+  if [ "$health" = 'green' ] || [ "$health" = 'yellow' ]; then
+    exit 0
+  fi
+  echo >&2 "Unexpected health status: $health"
+fi
+
+exit 1
diff --git a/images/php/7.1-cli/bin/cloud-deploy b/images/php/7.1-cli/bin/cloud-deploy
@@ -8,4 +8,20 @@ echo "Running \"deploy\" hook."
 
 run-hooks deploy
 
+# check that Varnish exists
+if ( varnish=$(curl -I varnish 2>&1 | grep -i "magento2") ); then
+    minor_magento_version=$(magento-command --version | sed "s/Magento CLI \([0-9]*\.[0-9]*\).*/\1/")
+    if [[ "$minor_magento_version" != "2.1" ]]; then
+        output=$(magento-command config:set system/full_page_cache/caching_application 2)
+        # as config:set does not return error code, we check output text to continue set varnish settings
+        if [[ $output == *"Value was saved"* ]]; then
+            echo "Setting Varnish for Magento FPC."
+            magento-command setup:config:set --http-cache-hosts=varnish -n
+        else
+            echo $output
+        fi
+    fi
+fi
+
+
 echo "Deployment finished."
diff --git a/images/php/7.2-cli/bin/cloud-deploy b/images/php/7.2-cli/bin/cloud-deploy
@@ -8,4 +8,20 @@ echo "Running \"deploy\" hook."
 
 run-hooks deploy
 
+# check that Varnish exists
+if ( varnish=$(curl -I varnish 2>&1 | grep -i "magento2") ); then
+    minor_magento_version=$(magento-command --version | sed "s/Magento CLI \([0-9]*\.[0-9]*\).*/\1/")
+    if [[ "$minor_magento_version" != "2.1" ]]; then
+        output=$(magento-command config:set system/full_page_cache/caching_application 2)
+        # as config:set does not return error code, we check output text to continue set varnish settings
+        if [[ $output == *"Value was saved"* ]]; then
+            echo "Setting Varnish for Magento FPC."
+            magento-command setup:config:set --http-cache-hosts=varnish -n
+        else
+            echo $output
+        fi
+    fi
+fi
+
+
 echo "Deployment finished."
diff --git a/images/php/7.3-cli/bin/cloud-deploy b/images/php/7.3-cli/bin/cloud-deploy
@@ -8,4 +8,20 @@ echo "Running \"deploy\" hook."
 
 run-hooks deploy
 
+# check that Varnish exists
+if ( varnish=$(curl -I varnish 2>&1 | grep -i "magento2") ); then
+    minor_magento_version=$(magento-command --version | sed "s/Magento CLI \([0-9]*\.[0-9]*\).*/\1/")
+    if [[ "$minor_magento_version" != "2.1" ]]; then
+        output=$(magento-command config:set system/full_page_cache/caching_application 2)
+        # as config:set does not return error code, we check output text to continue set varnish settings
+        if [[ $output == *"Value was saved"* ]]; then
+            echo "Setting Varnish for Magento FPC."
+            magento-command setup:config:set --http-cache-hosts=varnish -n
+        else
+            echo $output
+        fi
+    fi
+fi
+
+
 echo "Deployment finished."
diff --git a/images/php/cli/bin/cloud-deploy b/images/php/cli/bin/cloud-deploy
@@ -8,4 +8,20 @@ echo "Running \"deploy\" hook."
 
 run-hooks deploy
 
+# check that Varnish exists
+if ( varnish=$(curl -I varnish 2>&1 | grep -i "magento2") ); then
+    minor_magento_version=$(magento-command --version | sed "s/Magento CLI \([0-9]*\.[0-9]*\).*/\1/")
+    if [[ "$minor_magento_version" != "2.1" ]]; then
+        output=$(magento-command config:set system/full_page_cache/caching_application 2)
+        # as config:set does not return error code, we check output text to continue set varnish settings
+        if [[ $output == *"Value was saved"* ]]; then
+            echo "Setting Varnish for Magento FPC."
+            magento-command setup:config:set --http-cache-hosts=varnish -n
+        else
+            echo $output
+        fi
+    fi
+fi
+
+
 echo "Deployment finished."
diff --git a/images/tls/Dockerfile b/images/tls/Dockerfile
@@ -15,7 +15,6 @@ COPY certs/magento2.docker.pem /certs/cert.pem
 COPY pound.cfg /etc/pound/
 COPY entrypoint.sh /entrypoint.sh
 
-ENV HTTPS_UPSTREAM_SERVER_ADDRESS   varnish
 ENV HTTPS_UPSTREAM_SERVER_PORT  80
 ENV CERT_PATH   /certs/cert.pem
 ENV TIMEOUT 300
diff --git a/src/Command/BuildCompose.php b/src/Command/BuildCompose.php
@@ -51,6 +51,7 @@ class BuildCompose extends Command
     private const OPTION_MODE = 'mode';
     private const OPTION_SYNC_ENGINE = 'sync-engine';
     private const OPTION_NO_CRON = 'no-cron';
+    private const OPTION_NO_VARNISH = 'no-varnish';
     private const OPTION_WITH_SELENIUM = 'with-selenium';
 
     /**
@@ -206,14 +207,20 @@ protected function configure(): void
                     'File sync engine. Works only with developer mode. Available: (%s)',
                     implode(', ', DeveloperBuilder::SYNC_ENGINES_LIST)
                 ),
-                DeveloperBuilder::SYNC_ENGINE_DOCKER_SYNC
+                DeveloperBuilder::SYNC_ENGINE_NATIVE
             )
             ->addOption(
                 self::OPTION_NO_CRON,
                 null,
                 InputOption::VALUE_NONE,
                 'Remove cron container'
             )
+            ->addOption(
+                self::OPTION_NO_VARNISH,
+                null,
+                InputOption::VALUE_NONE,
+                'Remove Varnish container'
+            )
             ->addOption(
                 self::OPTION_WITH_SELENIUM,
                 null,
@@ -255,6 +262,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $config->set([
             DeveloperBuilder::KEY_SYNC_ENGINE => $syncEngine,
             ProductionBuilder::KEY_NO_CRON => $input->getOption(self::OPTION_NO_CRON),
+            ProductionBuilder::KEY_NO_VARNISH => $input->getOption(self::OPTION_NO_VARNISH),
             ProductionBuilder::KEY_WITH_SELENIUM => $input->getOption(self::OPTION_WITH_SELENIUM)
         ]);
 
@@ -266,11 +274,16 @@ public function execute(InputInterface $input, OutputInterface $output)
             $this->distGenerator->generate();
         }
 
-        $builder->setConfig($config);
+        $compose = $builder->build($config);
 
         $this->filesystem->put(
             $builder->getPath(),
-            Yaml::dump($builder->build(), 6, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK)
+            Yaml::dump([
+                'version' => $compose->getVersion(),
+                'services' => $compose->getServices(),
+                'volumes' => $compose->getVolumes(),
+                'networks' => $compose->getNetworks()
+            ], 6, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK)
         );
 
         $output->writeln('<info>Configuration was built.</info>');
diff --git a/src/Compose/BuilderInterface.php b/src/Compose/BuilderInterface.php
@@ -9,26 +9,59 @@
 
 use Illuminate\Contracts\Config\Repository;
 use Magento\CloudDocker\App\ConfigurationMismatchException;
+use Magento\CloudDocker\Service\ServiceInterface;
 
 interface BuilderInterface
 {
     public const DIR_MAGENTO = '/app';
 
-    /**
-     * @return array
-     * @throws ConfigurationMismatchException
-     */
-    public function build(): array;
+    public const DEFAULT_NGINX_VERSION = 'latest';
+    public const DEFAULT_VARNISH_VERSION = 'latest';
+    public const DEFAULT_TLS_VERSION = 'latest';
 
-    /**
-     * @param Repository $config
-     */
-    public function setConfig(Repository $config): void;
+    public const KEY_NO_CRON = 'no-cron';
+    public const KEY_NO_VARNISH = 'no-varnish';
+    public const KEY_EXPOSE_DB_PORT = 'expose-db-port';
+    public const KEY_NO_TMP_MOUNTS = 'no-tmp-mounts';
+    public const KEY_WITH_SELENIUM = 'with-selenium';
+
+    public const SERVICE_GENERIC = 'generic';
+    public const SERVICE_DB = 'db';
+    public const SERVICE_FPM = 'fpm';
+    public const SERVICE_BUILD = 'build';
+    public const SERVICE_DEPLOY = 'deploy';
+    public const SERVICE_WEB = 'web';
+    public const SERVICE_VARNISH = 'varnish';
+    public const SERVICE_SELENIUM = 'selenium';
+    public const SERVICE_TLS = 'tls';
+    public const SERVICE_RABBITMQ = ServiceInterface::NAME_RABBITMQ;
+    public const SERVICE_REDIS = ServiceInterface::NAME_REDIS;
+    public const SERVICE_ELASTICSEARCH = ServiceInterface::NAME_ELASTICSEARCH;
+    public const SERVICE_NODE = 'node';
+    public const SERVICE_CRON = 'cron';
+    public const SERVICE_TEST = 'test';
+
+    public const NETWORK_MAGENTO = 'magento';
+    public const NETWORK_MAGENTO_BUILD = 'magento-build';
+
+    public const VOLUME_MAGENTO = 'magento';
+    public const VOLUME_MAGENTO_VENDOR = 'magento-vendor';
+    public const VOLUME_MAGENTO_GENERATED = 'magento-generated';
+    public const VOLUME_MAGENTO_VAR = 'magento-var';
+    public const VOLUME_MAGENTO_ETC = 'magento-etc';
+    public const VOLUME_MAGENTO_STATIC = 'magento-static';
+    public const VOLUME_MAGENTO_MEDIA = 'magento-media';
+    public const VOLUME_MAGENTO_DB = 'magento-db';
+    public const VOLUME_MAGENTO_DEV = 'magento-dev';
+    public const VOLUME_DOCKER_MNT = 'docker-mnt';
 
     /**
-     * @return Repository
+     * @param Repository $config
+     * @return Manager
+     *
+     * @throws ConfigurationMismatchException
      */
-    public function getConfig(): Repository;
+    public function build(Repository $config): Manager;
 
     /**
      * @return string
diff --git a/src/Compose/DeveloperBuilder.php b/src/Compose/DeveloperBuilder.php
diff --git a/src/Compose/FunctionalBuilder.php b/src/Compose/FunctionalBuilder.php
diff --git a/src/Compose/Manager.php b/src/Compose/Manager.php
diff --git a/src/Compose/ManagerFactory.php b/src/Compose/ManagerFactory.php
diff --git a/src/Compose/ProductionBuilder.php b/src/Compose/ProductionBuilder.php
diff --git a/src/Compose/Resolver.php b/src/Compose/Resolver.php
diff --git a/src/Service/ServiceFactory.php b/src/Service/ServiceFactory.php
