Merge pull request #71 from magento-commerce/develop

BaDos · web-flow · commit 7eb25edbf9e9 · 2021-10-15T12:48:30.000-05:00
MCLOUD-8200: Release cloud tools
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.2.4",
+    "version": "1.3.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -13,10 +13,10 @@
         "composer/composer": "^1.0||^2.0",
         "composer/semver": "^1.0||^2.0||^3.0",
         "illuminate/config": "^5.5",
-        "symfony/config": "^4.4",
+        "symfony/config": "^4.4||^5.1",
         "symfony/console": "^2.8||^4.0",
-        "symfony/dependency-injection": "^3.3||^4.3",
-        "symfony/yaml": "^3.3||^4.0"
+        "symfony/dependency-injection": "^3.3||^4.3||^5.1",
+        "symfony/yaml": "^3.3||^4.0||^5.1"
     },
     "require-dev": {
         "codeception/codeception": "^4.1",
diff --git a/images/php/7.2-cli/Dockerfile b/images/php/7.2-cli/Dockerfile
@@ -18,7 +18,7 @@ ENV PHPRC ${MAGENTO_ROOT}/php.ini
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
 # Configure Node.js version
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash
+RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash
 
 # Install dependencies
 RUN apt-get update \
diff --git a/images/php/7.3-cli/Dockerfile b/images/php/7.3-cli/Dockerfile
@@ -18,7 +18,7 @@ ENV PHPRC ${MAGENTO_ROOT}/php.ini
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
 # Configure Node.js version
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash
+RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash
 
 # Install dependencies
 RUN apt-get update \
diff --git a/images/php/7.4-cli/Dockerfile b/images/php/7.4-cli/Dockerfile
@@ -18,7 +18,7 @@ ENV PHPRC ${MAGENTO_ROOT}/php.ini
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
 # Configure Node.js version
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash
+RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash
 
 # Install dependencies
 RUN apt-get update \
diff --git a/images/php/8.0-cli/Dockerfile b/images/php/8.0-cli/Dockerfile
@@ -18,7 +18,7 @@ ENV PHPRC ${MAGENTO_ROOT}/php.ini
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
 # Configure Node.js version
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash
+RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash
 
 # Install dependencies
 RUN apt-get update \
diff --git a/images/php/cli/Dockerfile b/images/php/cli/Dockerfile
@@ -18,7 +18,7 @@ ENV PHPRC ${MAGENTO_ROOT}/php.ini
 {%env_php_extensions%}
 
 # Configure Node.js version
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash
+RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash
 
 # Install dependencies
 RUN apt-get update \
diff --git a/src/Test/Functional/Acceptance/AbstractCest.php b/src/Test/Functional/Acceptance/AbstractCest.php
@@ -33,9 +33,9 @@ public function _before(\CliTester $I): void
         $I->cloneTemplateToWorkDir(static::TEMPLATE_VERSION);
         $I->createAuthJson();
         $I->createArtifactsDir();
-        $I->createArtifactCurrentTestedCode('docker', '1.2.99');
+        $I->createArtifactCurrentTestedCode('docker', '1.3.99');
         $I->addArtifactsRepoToComposer();
-        $I->addDependencyToComposer('magento/magento-cloud-docker', '1.2.99');
+        $I->addDependencyToComposer('magento/magento-cloud-docker', '1.3.99');
 
         $I->addEceToolsGitRepoToComposer();
         $I->addDependencyToComposer('magento/ece-tools', 'dev-develop as 2002.1.99');
diff --git a/src/Test/Functional/Acceptance/Services72Cest.php b/src/Test/Functional/Acceptance/Services72Cest.php
@@ -27,10 +27,10 @@ protected function servicesDataProvider(): array
                 'options' => '',
                 'expectedResult' => [
                     'redis:5.0',
-                    'magento/magento-cloud-docker-varnish:6.2-1.2',
-                    'magento/magento-cloud-docker-nginx:1.19-1.2',
-                    'magento/magento-cloud-docker-php:7.2-fpm-1.2',
-                    'magento/magento-cloud-docker-elasticsearch:5.2-1.2',
+                    'magento/magento-cloud-docker-varnish:6.2-1.3',
+                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-php:7.2-fpm-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:5.2-1.3',
                     'mariadb:10.2'
                 ],
                 'notExpectedResult' => ['rabbitmq', 'selenium/standalone-chrome:latest', 'cron'],
@@ -39,10 +39,10 @@ protected function servicesDataProvider(): array
                 'options' => '--redis=3.2 --db=10.1 --php=7.4 --rmq=3.5',
                 'expectedResult' => [
                     'redis:3.2',
-                    'magento/magento-cloud-docker-varnish:6.2-1.2',
-                    'magento/magento-cloud-docker-nginx:1.19-1.2',
-                    'magento/magento-cloud-docker-php:7.4-fpm-1.2',
-                    'magento/magento-cloud-docker-elasticsearch:5.2-1.2',
+                    'magento/magento-cloud-docker-varnish:6.2-1.3',
+                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-php:7.4-fpm-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:5.2-1.3',
                     'mariadb:10.1',
                     'rabbitmq:3.5'
                 ],
@@ -52,10 +52,10 @@ protected function servicesDataProvider(): array
                 'options' => '--redis=4.0 --db=10.2 --php=7.2 --rmq=3.6',
                 'expectedResult' => [
                     'redis:4.0',
-                    'magento/magento-cloud-docker-varnish:6.2-1.2',
-                    'magento/magento-cloud-docker-nginx:1.19-1.2',
-                    'magento/magento-cloud-docker-php:7.2-fpm-1.2',
-                    'magento/magento-cloud-docker-elasticsearch:5.2-1.2',
+                    'magento/magento-cloud-docker-varnish:6.2-1.3',
+                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-php:7.2-fpm-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:5.2-1.3',
                     'mariadb:10.2',
                     'rabbitmq:3.6'
                 ],
@@ -65,10 +65,10 @@ protected function servicesDataProvider(): array
                 'options' => '--with-cron --with-selenium',
                 'expectedResult' => [
                     'redis:5.0',
-                    'magento/magento-cloud-docker-varnish:6.2-1.2',
-                    'magento/magento-cloud-docker-nginx:1.19-1.2',
-                    'magento/magento-cloud-docker-php:7.2-fpm-1.2',
-                    'magento/magento-cloud-docker-elasticsearch:5.2-1.2',
+                    'magento/magento-cloud-docker-varnish:6.2-1.3',
+                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-php:7.2-fpm-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:5.2-1.3',
                     'mariadb:10.2',
                     'cron',
                     'selenium/standalone-chrome:latest'
diff --git a/src/Test/Functional/Acceptance/ServicesCest.php b/src/Test/Functional/Acceptance/ServicesCest.php
@@ -91,10 +91,10 @@ protected function servicesDataProvider(): array
                 'options' => '',
                 'expectedResult' => [
                     'redis:5.0',
-                    'magento/magento-cloud-docker-varnish:6.2-1.2',
-                    'magento/magento-cloud-docker-nginx:1.19-1.2',
-                    'magento/magento-cloud-docker-php:7.3-fpm-1.2',
-                    'magento/magento-cloud-docker-elasticsearch:6.5-1.2',
+                    'magento/magento-cloud-docker-varnish:6.2-1.3',
+                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-php:7.3-fpm-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2'
                 ],
                 'notExpectedResult' => ['rabbitmq', 'selenium/standalone-chrome:latest', 'cron'],
@@ -103,10 +103,10 @@ protected function servicesDataProvider(): array
                 'options' => '--redis=3.2 --db=10.1 --php=7.2 --rmq=3.5',
                 'expectedResult' => [
                     'redis:3.2',
-                    'magento/magento-cloud-docker-varnish:6.2-1.2',
-                    'magento/magento-cloud-docker-nginx:1.19-1.2',
-                    'magento/magento-cloud-docker-php:7.2-fpm-1.2',
-                    'magento/magento-cloud-docker-elasticsearch:6.5-1.2',
+                    'magento/magento-cloud-docker-varnish:6.2-1.3',
+                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-php:7.2-fpm-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.1',
                     'rabbitmq:3.5'
                 ],
@@ -116,10 +116,10 @@ protected function servicesDataProvider(): array
                 'options' => '--redis=4.0 --db=10.2 --php=7.4 --rmq=3.6',
                 'expectedResult' => [
                     'redis:4.0',
-                    'magento/magento-cloud-docker-varnish:6.2-1.2',
-                    'magento/magento-cloud-docker-nginx:1.19-1.2',
-                    'magento/magento-cloud-docker-php:7.4-fpm-1.2',
-                    'magento/magento-cloud-docker-elasticsearch:6.5-1.2',
+                    'magento/magento-cloud-docker-varnish:6.2-1.3',
+                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-php:7.4-fpm-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2',
                     'rabbitmq:3.6'
                 ],
@@ -129,10 +129,10 @@ protected function servicesDataProvider(): array
                 'options' => '--with-cron --with-selenium',
                 'expectedResult' => [
                     'redis:5.0',
-                    'magento/magento-cloud-docker-varnish:6.2-1.2',
-                    'magento/magento-cloud-docker-nginx:1.19-1.2',
-                    'magento/magento-cloud-docker-php:7.3-fpm-1.2',
-                    'magento/magento-cloud-docker-elasticsearch:6.5-1.2',
+                    'magento/magento-cloud-docker-varnish:6.2-1.3',
+                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-php:7.3-fpm-1.3',
+                    'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2',
                     'cron',
                     'selenium/standalone-chrome:latest'
