From 26d0165ea052404e13c8a55b8e117f3e930f4a7e Mon Sep 17 00:00:00 2001 From: Spryker CI Date: Thu, 28 Apr 2022 22:00:52 +0000 Subject: [PATCH 1/7] Update composer lock file. --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 02aa98269d..b5c43fb82d 100644 --- a/composer.lock +++ b/composer.lock @@ -5612,7 +5612,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "ce6bac76fada88a627f0b7f30b97e47265ab9a11" + "reference": "10134013f0ae27d2ad988f1b86326a22fca791d4" }, "require": { "php": ">=7.4" @@ -6522,7 +6522,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2022-04-28T20:30:53+00:00" + "time": "2022-04-28T21:58:05+00:00" }, { "name": "spryker/spryker-shop", From c709b8bd66ed75c4f11317d4069830ae46898d7c Mon Sep 17 00:00:00 2001 From: mscherer Date: Fri, 29 Apr 2022 02:19:40 +0200 Subject: [PATCH 2/7] Fix composer.json --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index b5c43fb82d..c0467e7867 100644 --- a/composer.lock +++ b/composer.lock @@ -5612,7 +5612,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "10134013f0ae27d2ad988f1b86326a22fca791d4" + "reference": "69a7a00d43d7e739933fd0cfae2e10697c9bd24f" }, "require": { "php": ">=7.4" @@ -6522,7 +6522,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2022-04-28T21:58:05+00:00" + "time": "2022-04-29T00:18:29+00:00" }, { "name": "spryker/spryker-shop", From 78000f5d9850afdb0c580c1a14da927c1bec2d2d Mon Sep 17 00:00:00 2001 From: Spryker CI Date: Fri, 29 Apr 2022 07:23:39 +0000 Subject: [PATCH 3/7] Update composer lock file. --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index c0467e7867..ea177e1874 100644 --- a/composer.lock +++ b/composer.lock @@ -5612,7 +5612,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "69a7a00d43d7e739933fd0cfae2e10697c9bd24f" + "reference": "edb5991039695b0253839b4e811b96da020f3cbc" }, "require": { "php": ">=7.4" @@ -6522,7 +6522,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2022-04-29T00:18:29+00:00" + "time": "2022-04-29T07:20:40+00:00" }, { "name": "spryker/spryker-shop", @@ -16268,7 +16268,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/development-core.git", - "reference": "6cbdcd13c86cbee9a5b6bf610528a7706d94adca" + "reference": "290c734ec3e55d382bda9d9e34460526b21a469d" }, "require": { "composer/semver": "^1.0.0 || ^2.0.0 || ^3.0.0", @@ -16332,7 +16332,7 @@ "proprietary" ], "description": "DevelopmentCore module", - "time": "2022-04-21T12:30:49+00:00" + "time": "2022-04-29T00:57:17+00:00" }, { "name": "spryker/docker-chromedriver", From 4df84c48f59310aa657b21532262d49a7b506a58 Mon Sep 17 00:00:00 2001 From: Spryker CI Date: Fri, 29 Apr 2022 09:17:30 +0000 Subject: [PATCH 4/7] Update composer lock file. --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index ea177e1874..1b97e58bb7 100644 --- a/composer.lock +++ b/composer.lock @@ -5612,7 +5612,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "edb5991039695b0253839b4e811b96da020f3cbc" + "reference": "7dc326bfe1a32fa658b96d95385e4933751e445b" }, "require": { "php": ">=7.4" @@ -6522,7 +6522,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2022-04-29T07:20:40+00:00" + "time": "2022-04-29T09:14:16+00:00" }, { "name": "spryker/spryker-shop", From e12bc18cf520882fb2011204f0a2bc0d767648a1 Mon Sep 17 00:00:00 2001 From: Spryker CI Date: Fri, 29 Apr 2022 10:28:45 +0000 Subject: [PATCH 5/7] Update composer lock file. --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 1b97e58bb7..e4349a78b9 100644 --- a/composer.lock +++ b/composer.lock @@ -6530,7 +6530,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker-shop.git", - "reference": "a9db61b8a32ef43a549cd36b062f06d9076af981" + "reference": "eb2917927e7d1ef4a4ca8e142e6c0c991745dc81" }, "require": { "php": ">=7.4" @@ -6707,7 +6707,7 @@ "proprietary" ], "description": "Spryker Shop page and widget modules", - "time": "2022-04-28T14:29:00+00:00" + "time": "2022-04-29T10:25:56+00:00" }, { "name": "spryker/synchronization-behavior", From 43ea843625269cf0c0db5146e7e37723fcc8ce03 Mon Sep 17 00:00:00 2001 From: Filip Sushko Date: Tue, 3 May 2022 09:21:58 +0200 Subject: [PATCH 6/7] SC-7808: Introduced support of ARM architecture in DockerSDK (#6717) SC-7808 Introduced support of ARM architecture in DockerSDK --- .git.docker | 2 +- config/Shared/config_default.php | 1 + deploy.aws-env-template.yml | 3 +++ deploy.ci.acceptance.mariadb.yml | 3 +++ deploy.ci.acceptance.yml | 3 +++ deploy.ci.api.mariadb.yml | 3 +++ deploy.ci.api.yml | 3 +++ deploy.ci.functional.mariadb.yml | 3 +++ deploy.ci.functional.yml | 3 +++ deploy.ci.yml | 3 +++ deploy.dev.yml | 3 +++ deploy.spryker-69new.yml | 9 ++++++--- deploy.spryker-sns.yml | 3 +++ deploy.spryker-staging.yml | 3 +++ deploy.yml | 3 +++ docker | 2 +- 16 files changed, 45 insertions(+), 5 deletions(-) diff --git a/.git.docker b/.git.docker index e2ed293ec2..a64608c3ef 100644 --- a/.git.docker +++ b/.git.docker @@ -1 +1 @@ -b8782123c4dc89f2925161ea3421d959990dc697 +3966b3b4728e22fdf214d5830b18ad903593bfdb diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index 2ff382bd0b..d84b57577d 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -467,6 +467,7 @@ ]; $config[SchedulerJenkinsConstants::JENKINS_CONFIGURATION] = [ SchedulerConfig::SCHEDULER_JENKINS => [ + SchedulerJenkinsConfig::SCHEDULER_JENKINS_CSRF_ENABLED => (bool)getenv('SPRYKER_JENKINS_CSRF_PROTECTION_ENABLED'), SchedulerJenkinsConfig::SCHEDULER_JENKINS_BASE_URL => sprintf( '%s://%s:%s/', getenv('SPRYKER_SCHEDULER_PROTOCOL') ?: 'http', diff --git a/deploy.aws-env-template.yml b/deploy.aws-env-template.yml index 8f51aaa422..7b14f98ddc 100644 --- a/deploy.aws-env-template.yml +++ b/deploy.aws-env-template.yml @@ -187,6 +187,7 @@ services: protocol: tcp broker: engine: rabbitmq + version: '3.9' api: username: "spryker" password: "secret" @@ -209,6 +210,8 @@ services: protocol: tcp scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true endpoints: scheduler.example.cloud.spryker.toys: mail_catcher: diff --git a/deploy.ci.acceptance.mariadb.yml b/deploy.ci.acceptance.mariadb.yml index b98697f7e2..5a89150fb1 100644 --- a/deploy.ci.acceptance.mariadb.yml +++ b/deploy.ci.acceptance.mariadb.yml @@ -117,6 +117,7 @@ services: password: 'secret' broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -129,6 +130,8 @@ services: version: '7.10' scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true mail_catcher: engine: mailhog webdriver: diff --git a/deploy.ci.acceptance.yml b/deploy.ci.acceptance.yml index 6de19520cc..4d19a7f0a0 100644 --- a/deploy.ci.acceptance.yml +++ b/deploy.ci.acceptance.yml @@ -116,6 +116,7 @@ services: password: 'secret' broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -128,6 +129,8 @@ services: version: 7.6 scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true mail_catcher: engine: mailhog webdriver: diff --git a/deploy.ci.api.mariadb.yml b/deploy.ci.api.mariadb.yml index 506be0a3be..e32f38eef7 100644 --- a/deploy.ci.api.mariadb.yml +++ b/deploy.ci.api.mariadb.yml @@ -117,6 +117,7 @@ services: password: 'secret' broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -129,6 +130,8 @@ services: version: '7.10' scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true mail_catcher: engine: mailhog diff --git a/deploy.ci.api.yml b/deploy.ci.api.yml index 08dfa197c0..2c417b8ab8 100644 --- a/deploy.ci.api.yml +++ b/deploy.ci.api.yml @@ -117,6 +117,7 @@ services: password: 'secret' broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -129,6 +130,8 @@ services: version: 7.6 scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true mail_catcher: engine: mailhog diff --git a/deploy.ci.functional.mariadb.yml b/deploy.ci.functional.mariadb.yml index 665e671ab7..1cc73f7e12 100644 --- a/deploy.ci.functional.mariadb.yml +++ b/deploy.ci.functional.mariadb.yml @@ -119,6 +119,7 @@ services: password: 'secret' broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -131,6 +132,8 @@ services: version: '7.10' scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true mail_catcher: engine: mailhog diff --git a/deploy.ci.functional.yml b/deploy.ci.functional.yml index 9e6a75ca37..8482b549c5 100644 --- a/deploy.ci.functional.yml +++ b/deploy.ci.functional.yml @@ -118,6 +118,7 @@ services: password: 'secret' broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -130,6 +131,8 @@ services: version: 7.6 scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true mail_catcher: engine: mailhog diff --git a/deploy.ci.yml b/deploy.ci.yml index 8f3d572d90..f048321fc8 100644 --- a/deploy.ci.yml +++ b/deploy.ci.yml @@ -199,6 +199,7 @@ services: protocol: tcp broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -221,6 +222,8 @@ services: protocol: tcp scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true endpoints: scheduler.night-test.cloud.spryker.toys: mail_catcher: diff --git a/deploy.dev.yml b/deploy.dev.yml index 4b888016c1..8212dfc7b9 100644 --- a/deploy.dev.yml +++ b/deploy.dev.yml @@ -230,6 +230,7 @@ services: protocol: tcp broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -252,6 +253,8 @@ services: protocol: tcp scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true endpoints: scheduler.spryker.local: mail_catcher: diff --git a/deploy.spryker-69new.yml b/deploy.spryker-69new.yml index f1b188b435..bac4fc1289 100644 --- a/deploy.spryker-69new.yml +++ b/deploy.spryker-69new.yml @@ -152,13 +152,13 @@ groups: store: AT services: session: - namespace: 8 + namespace: 8 mp.us.69-new.demo-spryker.com: entry-point: MerchantPortal store: US services: session: - namespace: 9 + namespace: 9 Yves: application: yves endpoints: @@ -205,7 +205,7 @@ groups: entry-point: BackendApi backend-api.us.69-new.demo-spryker.com: store: US - entry-point: BackendApi + entry-point: BackendApi Glue: application: glue endpoints: @@ -227,6 +227,7 @@ services: protocol: tcp broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -249,6 +250,8 @@ services: protocol: tcp scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true endpoints: scheduler.69-new.demo-spryker.com: mail_catcher: diff --git a/deploy.spryker-sns.yml b/deploy.spryker-sns.yml index a868eadaad..5a5f402fe4 100644 --- a/deploy.spryker-sns.yml +++ b/deploy.spryker-sns.yml @@ -227,6 +227,7 @@ services: protocol: tcp broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -249,6 +250,8 @@ services: protocol: tcp scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true endpoints: scheduler.suite-nonsplit.demo-spryker.com: mail_catcher: diff --git a/deploy.spryker-staging.yml b/deploy.spryker-staging.yml index 7af126717c..ea7ff6afb4 100644 --- a/deploy.spryker-staging.yml +++ b/deploy.spryker-staging.yml @@ -198,6 +198,7 @@ services: protocol: tcp broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -220,6 +221,8 @@ services: protocol: tcp scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true endpoints: scheduler.staging.cloud.spryker.toys: mail_catcher: diff --git a/deploy.yml b/deploy.yml index cc0720b24d..7fd637cc8a 100644 --- a/deploy.yml +++ b/deploy.yml @@ -228,6 +228,7 @@ services: protocol: tcp broker: engine: rabbitmq + version: '3.9' api: username: 'spryker' password: 'secret' @@ -250,6 +251,8 @@ services: protocol: tcp scheduler: engine: jenkins + version: '2.324' + csrf-protection-enabled: true endpoints: scheduler.spryker.local: mail_catcher: diff --git a/docker b/docker index b8782123c4..3966b3b472 160000 --- a/docker +++ b/docker @@ -1 +1 @@ -Subproject commit b8782123c4dc89f2925161ea3421d959990dc697 +Subproject commit 3966b3b4728e22fdf214d5830b18ad903593bfdb From 39b6f790424ca614e435a3a02c6f208b08d83ba6 Mon Sep 17 00:00:00 2001 From: Spryker CI Date: Tue, 3 May 2022 07:26:09 +0000 Subject: [PATCH 7/7] SC-7808 Merge nonsplit/master. --- composer.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/composer.lock b/composer.lock index cc151259fa..646d57e60f 100644 --- a/composer.lock +++ b/composer.lock @@ -241,16 +241,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.222.1", + "version": "3.222.3", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "632621d97180e82d3adc1245a7b272774c30dbf5" + "reference": "52b493b7b27de55e300afd26eff0be58d3689033" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/632621d97180e82d3adc1245a7b272774c30dbf5", - "reference": "632621d97180e82d3adc1245a7b272774c30dbf5", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/52b493b7b27de55e300afd26eff0be58d3689033", + "reference": "52b493b7b27de55e300afd26eff0be58d3689033", "shasum": "" }, "require": { @@ -326,9 +326,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.222.1" + "source": "https://github.com/aws/aws-sdk-php/tree/3.222.3" }, - "time": "2022-04-28T18:17:24+00:00" + "time": "2022-05-02T18:16:06+00:00" }, { "name": "brick/math", @@ -63506,12 +63506,12 @@ "source": { "type": "git", "url": "https://github.com/JetBrains/phpstorm-stubs.git", - "reference": "3495280dc50b3519c77e11a02422064312f36d71" + "reference": "004d450ed5c4bf40e89be62159e081368aa1a200" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/3495280dc50b3519c77e11a02422064312f36d71", - "reference": "3495280dc50b3519c77e11a02422064312f36d71", + "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/004d450ed5c4bf40e89be62159e081368aa1a200", + "reference": "004d450ed5c4bf40e89be62159e081368aa1a200", "shasum": "" }, "require-dev": { @@ -63547,7 +63547,7 @@ "support": { "source": "https://github.com/JetBrains/phpstorm-stubs/tree/master" }, - "time": "2022-04-28T08:53:09+00:00" + "time": "2022-05-02T16:52:47+00:00" }, { "name": "mikey179/vfsstream", @@ -64986,16 +64986,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.6.3", + "version": "1.6.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "6128620b98292e0b69ea6d799871d77163681c8e" + "reference": "e4cd0c2dd97809fcfdcd1f367ccf0be86c235168" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6128620b98292e0b69ea6d799871d77163681c8e", - "reference": "6128620b98292e0b69ea6d799871d77163681c8e", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e4cd0c2dd97809fcfdcd1f367ccf0be86c235168", + "reference": "e4cd0c2dd97809fcfdcd1f367ccf0be86c235168", "shasum": "" }, "require": { @@ -65021,7 +65021,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.6.3" + "source": "https://github.com/phpstan/phpstan/tree/1.6.4" }, "funding": [ { @@ -65041,7 +65041,7 @@ "type": "tidelift" } ], - "time": "2022-04-28T11:27:53+00:00" + "time": "2022-05-02T16:02:21+00:00" }, { "name": "phpunit/php-code-coverage", @@ -65466,16 +65466,16 @@ }, { "name": "psalm/phar", - "version": "4.22.0", + "version": "4.23.0", "source": { "type": "git", "url": "https://github.com/psalm/phar.git", - "reference": "feebed09c9782d9aaa819b794d880c2671ba0e4c" + "reference": "92700588da7c19107e4c465641ef10ac1a30e105" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/phar/zipball/feebed09c9782d9aaa819b794d880c2671ba0e4c", - "reference": "feebed09c9782d9aaa819b794d880c2671ba0e4c", + "url": "https://api.github.com/repos/psalm/phar/zipball/92700588da7c19107e4c465641ef10ac1a30e105", + "reference": "92700588da7c19107e4c465641ef10ac1a30e105", "shasum": "" }, "require": { @@ -65495,9 +65495,9 @@ "description": "Composer-based Psalm Phar", "support": { "issues": "https://github.com/psalm/phar/issues", - "source": "https://github.com/psalm/phar/tree/4.22.0" + "source": "https://github.com/psalm/phar/tree/4.23.0" }, - "time": "2022-02-27T11:01:37+00:00" + "time": "2022-05-02T02:15:17+00:00" }, { "name": "sebastian/cli-parser",