[skywalking-showcase] 09/12: Rename some env var and optimize make targets

[ke...@apache.org]

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

commit a49c76507543eb6823fc329b18fabcc39ad9246a
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Wed Nov 3 23:13:25 2021 +0800

    Rename some env var and optimize make targets
---
 Makefile                                   | 4 ++--
 Makefile.in                                | 5 +++--
 deploy/platform/docker/docker-compose.yaml | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index fcbb6c9..d4def26 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ docker.build: $(services_docker)
 
 ## Docker Compose
 .PHONY: deploy.docker
-deploy.docker: undeploy.docker docker.build
+deploy.docker: undeploy.docker
 	$(MAKE) -C deploy/platform/docker deploy
 
 .PHONY: undeploy.docker
@@ -54,7 +54,7 @@ undeploy.docker:
 
 ## Kubernetes
 .PHONY: deploy.kubernetes
-deploy.kubernetes: undeploy.kubernetes docker.build
+deploy.kubernetes: undeploy.kubernetes
 	$(MAKE) -C deploy/platform/kubernetes deploy
 
 .PHONY: undeploy.kubernetes
diff --git a/Makefile.in b/Makefile.in
index 1e1cc03..8ff0265 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,8 +22,9 @@ HUB ?= ghcr.io/apache/skywalking-showcase
 TAG ?= $(shell git rev-parse --short HEAD)
 
 ES_VERSION ?= 7.10.0
-OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:c9bd79e8bb974e404766e3490c00c7404b9baf1e
-ROCKET_BOT_IMAGE ?= ghcr.io/apache/skywalking/ui:c9bd79e8bb974e404766e3490c00c7404b9baf1e
+
+SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:c9bd79e8bb974e404766e3490c00c7404b9baf1e
+SW_ROCKET_BOT_IMAGE ?= ghcr.io/apache/skywalking/ui:c9bd79e8bb974e404766e3490c00c7404b9baf1e
 
 SW_AGENT_NODEJS_BACKEND_VERSION ?= e755659c7f308d3b5589619778c8360308cb14f8
 SW_AGENT_NODEJS_FRONTEND_VERSION ?= af0565a67d382b683c1dbd94c379b7080db61449
diff --git a/deploy/platform/docker/docker-compose.yaml b/deploy/platform/docker/docker-compose.yaml
index 573fb0a..a1c908e 100644
--- a/deploy/platform/docker/docker-compose.yaml
+++ b/deploy/platform/docker/docker-compose.yaml
@@ -38,7 +38,7 @@ services:
         hard: -1
 
   oap:
-    image: ${OAP_IMAGE}
+    image: ${SW_OAP_IMAGE}
     networks: [ sw ]
     environment:
       SW_HEALTH_CHECKER: default
@@ -56,7 +56,7 @@ services:
         condition: service_healthy
 
   rocket-bot:
-    image: ${ROCKET_BOT_IMAGE}
+    image: ${SW_ROCKET_BOT_IMAGE}
     networks: [ sw ]
     ports:
       - "9999:8080"