Add support for searchengine attribute to specify different search en…

…gines (#802)

Some of this will live in docker harness but testing it here atm

related docker harness changes
inviqa/harness-docker#145

.ci/sample-dynamic/workspace.yml

@@ -1,7 +1,7 @@
 workspace('ci-spryker-sample-dynamic'):
   description: generated local workspace for ci-spryker-sample.
   harnessLayers:
-    - inviqa/docker:v0.3.0
+    - https://github.com/inviqa/harness-docker/archive/refs/tags/0.4.0-alpha1.tar.gz
     # - inviqa/spryker # installed by test
 
 attribute('aws.bucket'): null

.ci/sample-static/workspace.yml

@@ -1,7 +1,7 @@
 workspace('ci-spryker-sample-static'):
   description: generated local workspace for ci-spryker-sample.
   harnessLayers:
-    - inviqa/docker:v0.3.0
+    - https://github.com/inviqa/harness-docker/archive/refs/tags/0.4.0-alpha1.tar.gz
     # - inviqa/spryker # installed by test
 
 attribute('app.build'): static

application/skeleton/config/Shared/config_local.php

@@ -97,11 +97,11 @@
     = PropelConfig::DB_ENGINE_PGSQL;
 
 // ---------- Elasticsearch
-$config[SearchElasticsearchConstants::HOST] = getenv('ELASTICSEARCH_HOST', true);
-$config[SearchElasticsearchConstants::TRANSPORT] = getenv('ELASTICSEARCH_SCHEME', true) ?: 'http';
-$config[SearchElasticsearchConstants::PORT] = getenv('ELASTICSEARCH_PORT', true);
-if (getenv('ELASTICSEARCH_USERNAME', true)) {
-    $config[SearchElasticsearchConstants::AUTH_HEADER] = base64_encode(getenv('ELASTICSEARCH_USERNAME', true) . ':' . getenv('ELASTICSEARCH_PASSWORD', true));
+$config[SearchElasticsearchConstants::HOST] = getenv('SEARCHENGINE_HOST', true);
+$config[SearchElasticsearchConstants::TRANSPORT] = getenv('SEARCHENGINE_SCHEME', true) ?: 'http';
+$config[SearchElasticsearchConstants::PORT] = getenv('SEARCHENGINE_PORT', true);
+if (getenv('SEARCHENGINE_USERNAME', true)) {
+    $config[SearchElasticsearchConstants::AUTH_HEADER] = base64_encode(getenv('SEARCHENGINE_USERNAME', true) . ':' . getenv('SEARCHENGINE_PASSWORD', true));
 }
 $ELASTICA_INDEX_NAME = strtolower($CURRENT_STORE) . '_search';
 $config[CollectorConstants::ELASTICA_PARAMETER__INDEX_NAME] = $ELASTICA_INDEX_NAME;

harness.yml

@@ -2,7 +2,7 @@
 harness('inviqa/spryker'):
   description: A docker based development environment for Spryker
   parentLayers:
-    - inviqa/docker:v0.3.0
+    - https://github.com/inviqa/harness-docker/archive/refs/tags/0.4.0-alpha1.tar.gz
   require:
     services:
       - proxy
@@ -42,6 +42,11 @@ attributes:
     user: spryker
     pass: spryker
     name: spryker
+  searchengine:
+    platform: elasticsearch
+    platform_version: >
+      = version_compare(@('spryker.demoshop-version'), '202009.0', '<=') ? '6'
+      : '7'
   backend:
     build:
       when: 'true'
@@ -76,9 +81,6 @@ attributes:
         - task spryker:build:frontend
         - ~
         - ~
-  elasticsearch:
-    image: elasticsearch
-    tag: "= version_compare(@('spryker.demoshop-version'), '202009.0', '<=') ? '6.8.23' : '7.16.3'"
   hostname_aliases: "= replace(filter_empty(flatten([
       @('glue.external_hosts'),
       @('yves.external_hosts'),