Merge branch 'develop' into imported-magento-magento-cloud-docker-298

oshmyheliuk · web-flow · commit dead3a2a52ae · 2020-12-21T09:04:26.000-06:00
diff --git a/images/php/7.2-cli/Dockerfile b/images/php/7.2-cli/Dockerfile
@@ -134,8 +134,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mkdir -p /tmp/blackfire \
   && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
-  && ( echo extension=blackfire.so \
-  && echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
+  && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
diff --git a/images/php/7.2-fpm/Dockerfile b/images/php/7.2-fpm/Dockerfile
@@ -113,8 +113,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mkdir -p /tmp/blackfire \
   && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
-  && ( echo extension=blackfire.so \
-  && echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
+  && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
diff --git a/images/php/7.3-cli/Dockerfile b/images/php/7.3-cli/Dockerfile
@@ -131,8 +131,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mkdir -p /tmp/blackfire \
   && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
-  && ( echo extension=blackfire.so \
-  && echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
+  && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
diff --git a/images/php/7.3-fpm/Dockerfile b/images/php/7.3-fpm/Dockerfile
@@ -110,8 +110,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mkdir -p /tmp/blackfire \
   && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
-  && ( echo extension=blackfire.so \
-  && echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
+  && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
diff --git a/images/php/7.4-cli/Dockerfile b/images/php/7.4-cli/Dockerfile
@@ -121,8 +121,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mkdir -p /tmp/blackfire \
   && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
-  && ( echo extension=blackfire.so \
-  && echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
+  && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
diff --git a/images/php/7.4-fpm/Dockerfile b/images/php/7.4-fpm/Dockerfile
@@ -100,8 +100,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mkdir -p /tmp/blackfire \
   && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
-  && ( echo extension=blackfire.so \
-  && echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
+  && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
diff --git a/src/Compose/BuilderInterface.php b/src/Compose/BuilderInterface.php
@@ -48,9 +48,9 @@ interface BuilderInterface
     public const VOLUME_MAGENTO_DB_QUOTE = 'magento-db-quote';
     public const VOLUME_MAGENTO_DB_SALES = 'magento-db-sales';
     public const VOLUME_MAGENTO_DEV = './dev';
-    public const VOLUME_DOCKER_ETRYPOINT = '.docker/mysql/docker-entrypoint-initdb.d';
-    public const VOLUME_DOCKER_ETRYPOINT_QUOTE = '.docker/mysql-quote/docker-entrypoint-initdb.d';
-    public const VOLUME_DOCKER_ETRYPOINT_SALES = '.docker/mysql-sales/docker-entrypoint-initdb.d';
+    public const VOLUME_DOCKER_ENTRYPOINT = '.docker/mysql/docker-entrypoint-initdb.d';
+    public const VOLUME_DOCKER_ENTRYPOINT_QUOTE = '.docker/mysql-quote/docker-entrypoint-initdb.d';
+    public const VOLUME_DOCKER_ENTRYPOINT_SALES = '.docker/mysql-sales/docker-entrypoint-initdb.d';
 
     public const SYNC_ENGINE_NATIVE = 'native';
 
diff --git a/src/Compose/DeveloperBuilder.php b/src/Compose/DeveloperBuilder.php
@@ -7,7 +7,6 @@
 
 namespace Magento\CloudDocker\Compose;
 
-use Magento\CloudDocker\App\ConfigurationMismatchException;
 use Magento\CloudDocker\Compose\Php\ExtensionResolver;
 use Magento\CloudDocker\Config\Config;
 use Magento\CloudDocker\Config\Environment\Converter;
@@ -97,14 +96,6 @@ public function build(Config $config): Manager
             $volumes = [$volumePrefix . self::VOLUME_MAGENTO_SYNC . ':' . self::DIR_MAGENTO . ':nocopy'];
         }
 
-        if ($config->hasMariaDbConf()) {
-            $volumesList[$volumePrefix . self::VOLUME_MARIADB_CONF] = [];
-        }
-
-        if ($config->hasDbEntrypoint()) {
-            $volumesList[self::VOLUME_DOCKER_ETRYPOINT] = [];
-        }
-
         $manager->setVolumes($volumesList);
 
         /**
@@ -129,11 +120,11 @@ public function build(Config $config): Manager
         ];
 
         if ($config->hasMariaDbConf()) {
-            $dbVolumes[] = $volumePrefix . self::VOLUME_MARIADB_CONF . ':/etc/mysql/mariadb.conf.d';
+            $dbVolumes[] = self::VOLUME_MARIADB_CONF . ':/etc/mysql/mariadb.conf.d';
         }
 
         if ($config->hasDbEntrypoint()) {
-            $dbVolumes[] = self::VOLUME_DOCKER_ETRYPOINT . ':/docker-entrypoint-initdb.d';
+            $dbVolumes[] = self::VOLUME_DOCKER_ENTRYPOINT . ':/docker-entrypoint-initdb.d';
         }
 
         $manager->updateService(self::SERVICE_DB, [
diff --git a/src/Compose/Php/ExtensionResolver.php b/src/Compose/Php/ExtensionResolver.php
@@ -46,7 +46,7 @@ class ExtensionResolver
         'sysvsem',
         'sysvshm',
         'opcache',
-        'zip',
+        'zip'
     ];
 
     /**
@@ -172,8 +172,7 @@ public static function getConfig(): array
 mkdir -p /tmp/blackfire
 tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire
 mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so
-( echo extension=blackfire.so
-echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini
+echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini
 rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 BASH
 // phpcs:enable
diff --git a/src/Compose/ProductionBuilder/Service/Database/Db.php b/src/Compose/ProductionBuilder/Service/Database/Db.php
@@ -118,7 +118,7 @@ private function getMounts(Config $config): array
         $mounts[] = $config->getNameWithPrefix() . BuilderInterface::VOLUME_MAGENTO_DB . ':/var/lib/mysql';
 
         if ($config->hasDbEntrypoint()) {
-            $mounts[] = BuilderInterface::VOLUME_DOCKER_ETRYPOINT . ':/docker-entrypoint-initdb.d';
+            $mounts[] = BuilderInterface::VOLUME_DOCKER_ENTRYPOINT . ':/docker-entrypoint-initdb.d';
         }
 
         return $mounts;
diff --git a/src/Compose/ProductionBuilder/Service/Database/DbQuote.php b/src/Compose/ProductionBuilder/Service/Database/DbQuote.php
@@ -113,7 +113,7 @@ private function getMounts(Config $config): array
         }
 
         $mounts[] = BuilderInterface::VOLUME_MAGENTO_DB_QUOTE . ':/var/lib/mysql';
-        $mounts[] = BuilderInterface::VOLUME_DOCKER_ETRYPOINT_QUOTE . ':/docker-entrypoint-initdb.d';
+        $mounts[] = BuilderInterface::VOLUME_DOCKER_ENTRYPOINT_QUOTE . ':/docker-entrypoint-initdb.d';
 
         return $mounts;
     }
diff --git a/src/Compose/ProductionBuilder/Service/Database/DbSales.php b/src/Compose/ProductionBuilder/Service/Database/DbSales.php
@@ -113,7 +113,7 @@ private function getMounts(Config $config): array
         }
 
         $mounts[] = BuilderInterface::VOLUME_MAGENTO_DB_SALES . ':/var/lib/mysql';
-        $mounts[] = BuilderInterface::VOLUME_DOCKER_ETRYPOINT_SALES . ':/docker-entrypoint-initdb.d';
+        $mounts[] = BuilderInterface::VOLUME_DOCKER_ENTRYPOINT_SALES . ':/docker-entrypoint-initdb.d';
 
         return $mounts;
     }
diff --git a/src/Test/Integration/BuildComposeTest.php b/src/Test/Integration/BuildComposeTest.php
@@ -79,6 +79,14 @@ public function buildDataProvider(): array
                     [CliSource::OPTION_WITH_MARIADB_CONF, true]
                 ]
             ],
+            'cloud-base-developer' => [
+                __DIR__ . '/_files/cloud_base_developer',
+                [
+                    [CliSource::OPTION_MODE, BuilderFactory::BUILDER_DEVELOPER],
+                    [CliSource::OPTION_WITH_ENTRYPOINT, true],
+                    [CliSource::OPTION_WITH_MARIADB_CONF, true]
+                ]
+            ],
             'cloud-base-mftf' => [
                 __DIR__ . '/_files/cloud_base_mftf',
                 [
diff --git a/src/Test/Integration/_files/cloud_base_developer/.docker/.gitignore b/src/Test/Integration/_files/cloud_base_developer/.docker/.gitignore
diff --git a/src/Test/Integration/_files/cloud_base_developer/.docker/config.php.dist b/src/Test/Integration/_files/cloud_base_developer/.docker/config.php.dist
@@ -0,0 +1,47 @@
+<?php
+
+return [
+    'MAGENTO_CLOUD_RELATIONSHIPS' => base64_encode(json_encode([
+        'database' => [
+            [
+                'host' => 'db',
+                'path' => 'magento2',
+                'password' => 'magento2',
+                'username' => 'magento2',
+                'port' => '3306'
+            ]
+        ],
+        'redis' => [
+            [
+                'host' => 'redis',
+                'port' => '6379'
+            ]
+        ],
+        'elasticsearch' => [
+            [
+                'host' => 'elasticsearch',
+                'port' => '9200'
+            ]
+        ]
+    ])),
+    'MAGENTO_CLOUD_ROUTES' => base64_encode(json_encode([
+        'http://magento2.docker/' => [
+            'type' => 'upstream',
+            'original_url' => 'http://{default}'
+        ],
+        'https://magento2.docker/' => [
+            'type' => 'upstream',
+            'original_url' => 'https://{default}'
+        ]
+    ])),
+    'MAGENTO_CLOUD_VARIABLES' => base64_encode(json_encode([
+        'ADMIN_EMAIL' => 'admin@example.com',
+        'ADMIN_PASSWORD' => '123123q',
+        'ADMIN_URL' => 'admin'
+    ])),
+    'MAGENTO_CLOUD_APPLICATION' => base64_encode(json_encode([
+        'hooks' => [
+
+        ]
+    ])),
+];
diff --git a/src/Test/Integration/_files/cloud_base_developer/.magento.app.yaml b/src/Test/Integration/_files/cloud_base_developer/.magento.app.yaml
@@ -0,0 +1,29 @@
+name: mymagento
+
+type: php:7.3
+build:
+  flavor: composer
+
+runtime:
+  extensions:
+    - redis
+    - xsl
+    - json
+    - newrelic
+    - sodium
+
+relationships:
+  database: "mysql:mysql"
+  redis: "redis:redis"
+  elasticsearch: "elasticsearch:elasticsearch"
+
+mounts:
+  "var": "shared:files/var"
+  "app/etc": "shared:files/etc"
+  "pub/media": "shared:files/media"
+  "pub/static": "shared:files/static"
+
+crons:
+  cronrun:
+    spec: "* * * * *"
+    cmd: "php bin/magento cron:run"
diff --git a/src/Test/Integration/_files/cloud_base_developer/.magento/services.yaml b/src/Test/Integration/_files/cloud_base_developer/.magento/services.yaml
@@ -0,0 +1,14 @@
+mysql:
+  type: mysql:10.2
+  disk: 2048
+
+redis:
+  type: redis:5.0
+
+elasticsearch:
+  type: elasticsearch:6.5
+  disk: 1024
+  configuration:
+    plugins:
+      - plugin_1
+      - plugin_2
diff --git a/src/Test/Integration/_files/cloud_base_developer/composer.json b/src/Test/Integration/_files/cloud_base_developer/composer.json
@@ -0,0 +1,6 @@
+{
+  "name": "magento/project-enterprise-edition",
+  "description": "Composer file for integration tests",
+  "type": "project",
+  "version": "2.2.0"
+}
diff --git a/src/Test/Integration/_files/cloud_base_developer/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_developer/docker-compose.exp.yml

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ private function getMounts(Config $config): array`
`118`	`118`	`$mounts[] = $config->getNameWithPrefix() . BuilderInterface::VOLUME_MAGENTO_DB . ':/var/lib/mysql';`
`119`	`119`
`120`	`120`	`if ($config->hasDbEntrypoint()) {`
`121`		`- $mounts[] = BuilderInterface::VOLUME_DOCKER_ETRYPOINT . ':/docker-entrypoint-initdb.d';`
	`121`	`+ $mounts[] = BuilderInterface::VOLUME_DOCKER_ENTRYPOINT . ':/docker-entrypoint-initdb.d';`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`return $mounts;`