From 6f46f7dd1c9440005b45db9fc849bc5070c9b11c Mon Sep 17 00:00:00 2001 From: Ben Batschelet Date: Mon, 11 Oct 2021 21:20:40 -0500 Subject: [PATCH 1/4] Switch Node installer to LTS version (#69) --- images/php/7.2-cli/Dockerfile | 2 +- images/php/7.3-cli/Dockerfile | 2 +- images/php/7.4-cli/Dockerfile | 2 +- images/php/8.0-cli/Dockerfile | 2 +- images/php/cli/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/php/7.2-cli/Dockerfile b/images/php/7.2-cli/Dockerfile index 5835a202..47a9a6de 100644 --- 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 index eb2eb3ed..fe6cd9bf 100644 --- 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 index 284e64a7..23d0e18f 100644 --- 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 index 3b4477d3..d6fe9b5b 100644 --- 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 index d85bb0b2..e3ee52cf 100755 --- 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 \ From dc55b25618caff432da63af30383aa21cbcab8a6 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Mon, 11 Oct 2021 22:18:41 -0500 Subject: [PATCH 2/4] ACMP-1533: Symfony config dependency is incompatible with Magento 2.4.4 (#70) --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 96e453f0..6b202ace 100644 --- a/composer.json +++ b/composer.json @@ -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", From 72a8cbe47b1d27a03e018204fd5e375611c42398 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Wed, 13 Oct 2021 14:34:48 -0500 Subject: [PATCH 3/4] Bump version (#72) --- composer.json | 2 +- src/Test/Functional/Acceptance/AbstractCest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 6b202ace..1a5281a8 100644 --- 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" diff --git a/src/Test/Functional/Acceptance/AbstractCest.php b/src/Test/Functional/Acceptance/AbstractCest.php index 1929bd16..cb464442 100644 --- 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'); From 3d51e16214058ac5f6f38d3377e5b60fff1db9d5 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Fri, 15 Oct 2021 09:27:26 -0500 Subject: [PATCH 4/4] Fix tests after version bumping (#73) --- .../Functional/Acceptance/Services72Cest.php | 32 +++++++++---------- .../Functional/Acceptance/ServicesCest.php | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/Test/Functional/Acceptance/Services72Cest.php b/src/Test/Functional/Acceptance/Services72Cest.php index 3faaa38b..379e4466 100644 --- 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 index d4ed408f..cc777745 100644 --- 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'