From 4c95f07adb78252783ae2c3c774e18c6febae214 Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Tue, 28 Sep 2021 08:11:19 +0800
Subject: [PATCH] Set the Docker image names the same as the ones in
 hub.docker.io (#7820)

---
 Makefile                                      | 19 ++++++++++++++-----
 docs/en/guides/How-to-release.md              |  2 ++
 .../src/test/resources/docker-compose.one.yml |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 793d71dc98..a0127fabe6 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,8 @@ build.ui:
 DOCKER_BUILD_TOP:=${CONTEXT}/docker_build
 
 HUB ?= skywalking
+OAP_NAME ?= oap
+UI_NAME ?= ui
 TAG ?= latest
 
 .SECONDEXPANSION: #allow $@ to be used in dependency list
@@ -61,13 +63,17 @@ docker.oap: $(CONTEXT)/$(DIST)
 docker.oap: $(SW_ROOT)/docker/oap/Dockerfile.oap
 docker.oap: $(SW_ROOT)/docker/oap/docker-entrypoint.sh
 docker.oap: $(SW_ROOT)/docker/oap/log4j2.xml
-		$(DOCKER_RULE)
+docker.oap: NAME = $(OAP_NAME)
+docker.oap:
+	$(DOCKER_RULE)
 
 docker.ui: $(CONTEXT)/$(DIST)
 docker.ui: $(SW_ROOT)/docker/ui/Dockerfile.ui
 docker.ui: $(SW_ROOT)/docker/ui/docker-entrypoint.sh
 docker.ui: $(SW_ROOT)/docker/ui/logback.xml
-		$(DOCKER_RULE)
+docker.ui: NAME = $(UI_NAME)
+docker.ui:
+	$(DOCKER_RULE)
 
 # $@ is the name of the target
 # $^ the name of the dependencies for the target
@@ -79,13 +85,16 @@ docker.ui: $(SW_ROOT)/docker/ui/logback.xml
 # 4. This rule runs $(BUILD_PRE) prior to any docker build and only if specified as a dependency variable
 # 5. This rule finally runs docker build passing $(BUILD_ARGS) to docker if they are specified as a dependency variable
 
-DOCKER_RULE=time (mkdir -p $(DOCKER_BUILD_TOP)/$@ && cp -r $^ $(DOCKER_BUILD_TOP)/$@ && cd $(DOCKER_BUILD_TOP)/$@ && $(BUILD_PRE) docker build --no-cache $(BUILD_ARGS) -t $(HUB)/$(subst docker.,,$@):$(TAG) -f Dockerfile$(suffix $@) .)
+DOCKER_RULE=time (mkdir -p $(DOCKER_BUILD_TOP)/$@ && cp -r $^ $(DOCKER_BUILD_TOP)/$@ && cd $(DOCKER_BUILD_TOP)/$@ && $(BUILD_PRE) docker build --no-cache $(BUILD_ARGS) -t $(HUB)/$(NAME):$(TAG) -f Dockerfile$(suffix $@) .)
 
 # for each docker.XXX target create a push.docker.XXX target that pushes
 # the local docker image to another hub
 # a possible optimization is to use tag.$(TGT) as a dependency to do the tag for us
-$(foreach TGT,$(DOCKER_TARGETS),$(eval push.$(TGT): | $(TGT) ; \
-	time (docker push $(HUB)/$(subst docker.,,$(TGT)):$(TAG))))
+push.docker.oap: NAME = $(OAP_NAME)
+push.docker.ui: NAME = $(UI_NAME)
+
+$(foreach TGT,$(DOCKER_TARGETS),push.$(TGT)): push.%: %
+	time (docker push $(HUB)/$(NAME):$(TAG))
 
 # create a DOCKER_PUSH_TARGETS that's each of DOCKER_TARGETS with a push. prefix
 DOCKER_PUSH_TARGETS:=
diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md
index 78db15a5a3..4604ccc03e 100644
--- a/docs/en/guides/How-to-release.md
+++ b/docs/en/guides/How-to-release.md
@@ -293,6 +293,8 @@ svn co https://dist.apache.org/repos/dist/release/skywalking/$SW_VERSION release
 
 export CONTEXT=release
 export HUB=apache
+export OAP_NAME=skywalking-oap-server
+export UI_NAME=skywalking-ui
 export TAG=$SW_VERSION
 export DIST=<the binary package name inside (1), e.g. apache-skywalking-apm-8.8.0.tar.gz>
 make docker.all && make docker.push
diff --git a/test/e2e/e2e-common/src/test/resources/docker-compose.one.yml b/test/e2e/e2e-common/src/test/resources/docker-compose.one.yml
index 2d004b418a..8ea223e7a8 100644
--- a/test/e2e/e2e-common/src/test/resources/docker-compose.one.yml
+++ b/test/e2e/e2e-common/src/test/resources/docker-compose.one.yml
@@ -27,4 +27,4 @@ services:
       - '8080'
     image: skywalking/ui:latest
     networks:
-      - e2e
\ No newline at end of file
+      - e2e