You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/11/13 02:37:25 UTC
[skywalking-showcase] branch main updated: Expose the whole ElasticSearch image as variable instead of just version
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new 6afa571 Expose the whole ElasticSearch image as variable instead of just version
6afa571 is described below
commit 6afa5715929e9595fa1a9b9cf72164cadf36294b
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sat Nov 13 10:37:15 2021 +0800
Expose the whole ElasticSearch image as variable instead of just version
---
Makefile.in | 2 +-
deploy/platform/docker/docker-compose.single-node.yaml | 2 +-
deploy/platform/kubernetes/feature-cluster/resources.yaml | 2 +-
deploy/platform/kubernetes/feature-single-node/resources.yaml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 0add014..4aafddf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,7 +24,7 @@ DOCKER_BUILDKIT ?= 1
HUB ?= ghcr.io/apache/skywalking-showcase
TAG ?= $(shell git rev-parse --short HEAD)
-ES_VERSION ?= 7.10.0
+ES_IMAGE ?= docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0
SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:c9bd79e8bb974e404766e3490c00c7404b9baf1e
SW_ROCKET_BOT_IMAGE ?= ghcr.io/apache/skywalking/ui:c9bd79e8bb974e404766e3490c00c7404b9baf1e
diff --git a/deploy/platform/docker/docker-compose.single-node.yaml b/deploy/platform/docker/docker-compose.single-node.yaml
index dfc0bc6..b7e4c72 100644
--- a/deploy/platform/docker/docker-compose.single-node.yaml
+++ b/deploy/platform/docker/docker-compose.single-node.yaml
@@ -19,7 +19,7 @@ version: '2.1'
services:
elasticsearch:
- image: docker.elastic.co/elasticsearch/elasticsearch-oss:${ES_VERSION}
+ image: ${ES_IMAGE}
networks: [ sw ]
ports:
- "9200:9200"
diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index f2dc205..7638d41 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -49,7 +49,7 @@ spec:
spec:
containers:
- name: elasticsearch
- image: docker.elastic.co/elasticsearch/elasticsearch-oss:${ES_VERSION}
+ image: ${ES_IMAGE}
ports:
- containerPort: 9200
env:
diff --git a/deploy/platform/kubernetes/feature-single-node/resources.yaml b/deploy/platform/kubernetes/feature-single-node/resources.yaml
index 5af8ad0..e6f8e4f 100644
--- a/deploy/platform/kubernetes/feature-single-node/resources.yaml
+++ b/deploy/platform/kubernetes/feature-single-node/resources.yaml
@@ -49,7 +49,7 @@ spec:
spec:
containers:
- name: elasticsearch
- image: docker.elastic.co/elasticsearch/elasticsearch-oss:${ES_VERSION}
+ image: ${ES_IMAGE}
ports:
- containerPort: 9200
env: