[skywalking-docker] branch master updated: Improved docker compose file so can be run for ES6 and ES7 (#23)

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-docker.git


The following commit(s) were added to refs/heads/master by this push:
     new 7295174  Improved docker compose file so can be run for ES6 and ES7 (#23)
7295174 is described below

commit 729517484643282705d0ac3fc1e289e686636622
Author: andrewgkew <an...@gmail.com>
AuthorDate: Fri Aug 6 14:40:38 2021 +0100

    Improved docker compose file so can be run for ES6 and ES7 (#23)
    
    * Improved docker compose file so can be run for ES6 and ES7
    1. Updated compose file to include the SW_STORAGE env var otherwise it cant be overwritten when which between ES6 and ES7
    2. Add missing env var SW_VERSION into env files
    3. Updated versions of ES and SW to latest versions for both ES6 and ES7
    
    * Downgrading version of ES 7 due to introduction of SSPL licence to version 7.11
    
    * Removing SW_VERSION so that its not hardcoded to a particular version
    
    Co-authored-by: Andrew Kew <an...@quadcorps.co.uk>
---
 compose/.env.es6           | 4 ++--
 compose/.env.es7           | 4 ++--
 compose/docker-compose.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compose/.env.es6 b/compose/.env.es6
index a2ba582..b19df53 100644
--- a/compose/.env.es6
+++ b/compose/.env.es6
@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ES_VERSION=6.8.8
+ES_VERSION=6.8.18
 SW_STORAGE=elasticsearch
-IMAGE_TAG=es6
+IMAGE_TAG=es6
\ No newline at end of file
diff --git a/compose/.env.es7 b/compose/.env.es7
index d2ffb08..b4824c7 100644
--- a/compose/.env.es7
+++ b/compose/.env.es7
@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ES_VERSION=7.5.0
+ES_VERSION=7.10.0
 SW_STORAGE=elasticsearch7
-IMAGE_TAG=es7
+IMAGE_TAG=es7
\ No newline at end of file
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index 2eb19a5..a21ea43 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -56,7 +56,7 @@ services:
       retries: 3
       start_period: 40s
     environment:
-      SW_STORAGE: elasticsearch
+      SW_STORAGE: ${SW_STORAGE}
       SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200
       SW_HEALTH_CHECKER: default
       SW_TELEMETRY: prometheus