From d6c37a6f8583a0d592e332e57d2350fa88446937 Mon Sep 17 00:00:00 2001 From: andytson-inviqa Date: Thu, 16 Dec 2021 17:21:07 +0000 Subject: [PATCH 1/3] Upgrade all elasticsearch versions to latest version Even if a platform doesn't explicitly say it supports beyond 7.10, it will need upgrading --- src/_base/harness/attributes/common.yml | 2 +- src/akeneo/harness.yml | 5 ----- src/magento2/harness.yml | 2 -- src/spryker/harness.yml | 3 --- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/_base/harness/attributes/common.yml b/src/_base/harness/attributes/common.yml index bc8e4e86c..90f8c4656 100644 --- a/src/_base/harness/attributes/common.yml +++ b/src/_base/harness/attributes/common.yml @@ -311,7 +311,7 @@ attributes.default: host: elasticsearch image: elasticsearch port: 9200 - tag: '7.14.2' + tag: '7.16.1' domain: my127.site hostname: = @('namespace') ~ '.' ~ @('domain') diff --git a/src/akeneo/harness.yml b/src/akeneo/harness.yml index 697b22406..7b3862fad 100644 --- a/src/akeneo/harness.yml +++ b/src/akeneo/harness.yml @@ -134,11 +134,6 @@ attributes: image: console: = 'my127/akeneo:' ~ @('php.version') ~ '-fpm-buster-console' php-fpm: = 'my127/akeneo:' ~ @('php.version') ~ '-fpm-buster' - elasticsearch: - image: elasticsearch - tag: '7.10.1' - mysql: - tag: '8.0' nginx: # used to limit what is copied into an Nginx static-built image # vendor directory needed for vendor/*/*/*/public/ resources (images etc.) diff --git a/src/magento2/harness.yml b/src/magento2/harness.yml index 6b0c1f04f..e7fabd672 100644 --- a/src/magento2/harness.yml +++ b/src/magento2/harness.yml @@ -62,8 +62,6 @@ attributes: user: magento pass: magento name: magento - elasticsearch: - tag: '7.10.1' magento: edition: enterprise config: diff --git a/src/spryker/harness.yml b/src/spryker/harness.yml index e7b5c11b3..0939aba11 100644 --- a/src/spryker/harness.yml +++ b/src/spryker/harness.yml @@ -83,9 +83,6 @@ attributes: image: console: "= 'my127/spryker:' ~ @('php.version') ~ '-fpm-' ~ (@('php.version') >= 7.4 ? 'buster' : 'stretch') ~ '-console'" php-fpm: "= 'my127/spryker:' ~ @('php.version') ~ '-fpm-' ~ (@('php.version') >= 7.4 ? 'buster' : 'stretch')" - elasticsearch: - image: elasticsearch - tag: '6.8.12' hostname_aliases: "= replace(flatten([ @('glue.external_hosts'), @('yves.external_hosts'), From bdb4fc3cc303e86b802c71902213daaacaad61ba Mon Sep 17 00:00:00 2001 From: andytson-inviqa Date: Tue, 4 Jan 2022 11:13:14 +0000 Subject: [PATCH 2/3] Update elasticsearch to 7.16.2 for additional CVE fix --- src/_base/harness/attributes/common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_base/harness/attributes/common.yml b/src/_base/harness/attributes/common.yml index 90f8c4656..3d58aa0a6 100644 --- a/src/_base/harness/attributes/common.yml +++ b/src/_base/harness/attributes/common.yml @@ -311,7 +311,7 @@ attributes.default: host: elasticsearch image: elasticsearch port: 9200 - tag: '7.16.1' + tag: '7.16.2' domain: my127.site hostname: = @('namespace') ~ '.' ~ @('domain') From 4d19d5a5edbe7643fd949163df9d3e60fab6704e Mon Sep 17 00:00:00 2001 From: andytson-inviqa Date: Fri, 7 Jan 2022 15:57:27 +0000 Subject: [PATCH 3/3] Upgrade Spryker elasticsearch to 6.8.22 --- src/spryker/harness.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/spryker/harness.yml b/src/spryker/harness.yml index 0939aba11..16e5658a5 100644 --- a/src/spryker/harness.yml +++ b/src/spryker/harness.yml @@ -83,6 +83,9 @@ attributes: image: console: "= 'my127/spryker:' ~ @('php.version') ~ '-fpm-' ~ (@('php.version') >= 7.4 ? 'buster' : 'stretch') ~ '-console'" php-fpm: "= 'my127/spryker:' ~ @('php.version') ~ '-fpm-' ~ (@('php.version') >= 7.4 ? 'buster' : 'stretch')" + elasticsearch: + image: elasticsearch + tag: '6.8.22' hostname_aliases: "= replace(flatten([ @('glue.external_hosts'), @('yves.external_hosts'),