This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch chore/makefile-docker in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 8706b3a09eaaee545d29a91ccebe8068e5d53dbb Author: kezhenxu94 <[email protected]> AuthorDate: Mon Sep 27 22:09:37 2021 +0800 Set the Docker image names the same as the ones in hub.docker.io --- .github/workflows/e2e.istio.yaml | 8 ++++---- Makefile | 14 +++++++------- docker/.env | 4 ++-- docker/README.md | 4 ++-- docker/oap/{Dockerfile.oap => Dockerfile.oap-server} | 0 .../e2e-common/src/test/resources/docker-compose.one.yml | 4 ++-- .../e2e-common/src/test/resources/docker-compose.two.yml | 2 +- test/e2e/e2e-test/docker/base-compose.yml | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml index e864949..2185b2a 100644 --- a/.github/workflows/e2e.istio.yaml +++ b/.github/workflows/e2e.istio.yaml @@ -98,10 +98,10 @@ jobs: --set oap.env.K8S_SERVICE_NAME_RULE='e2e::${service.metadata.name}' \ --set oap.envoy.als.enabled=true \ --set oap.replicas=1 \ - --set ui.image.repository=skywalking/ui \ + --set ui.image.repository=skywalking/skywalking-ui \ --set ui.image.tag=$TAG \ --set oap.image.tag=$TAG \ - --set oap.image.repository=skywalking/oap \ + --set oap.image.repository=skywalking/skywalking-oap-server \ --set oap.storageType=elasticsearch kubectl -n istio-system get pods @@ -228,10 +228,10 @@ jobs: --set elasticsearch.minimumMasterNodes=1 \ --set elasticsearch.imageTag=7.5.1 \ --set oap.replicas=1 \ - --set ui.image.repository=skywalking/ui \ + --set ui.image.repository=skywalking/skywalking-ui \ --set ui.image.tag=$TAG \ --set oap.image.tag=$TAG \ - --set oap.image.repository=skywalking/oap \ + --set oap.image.repository=skywalking/skywalking-oap-server \ --set oap.storageType=elasticsearch kubectl -n istio-system get pods diff --git a/Makefile b/Makefile index 793d71d..644195e 100644 --- a/Makefile +++ b/Makefile @@ -43,11 +43,11 @@ TAG ?= latest .SECONDEXPANSION: #allow $@ to be used in dependency list -.PHONY: docker docker.all docker.oap +.PHONY: docker docker.all docker.oap-server docker: init build.all docker.all -DOCKER_TARGETS:=docker.oap docker.ui +DOCKER_TARGETS:=docker.oap-server docker.ui docker.all: $(DOCKER_TARGETS) @@ -57,10 +57,10 @@ endif BUILD_ARGS := $(BUILD_ARGS) --build-arg DIST=$(DIST) --build-arg SKYWALKING_CLI_VERSION=$(CLI_VERSION) -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.oap-server: $(CONTEXT)/$(DIST) +docker.oap-server: $(SW_ROOT)/docker/oap/Dockerfile.oap-server +docker.oap-server: $(SW_ROOT)/docker/oap/docker-entrypoint.sh +docker.oap-server: $(SW_ROOT)/docker/oap/log4j2.xml $(DOCKER_RULE) docker.ui: $(CONTEXT)/$(DIST) @@ -79,7 +79,7 @@ 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)/skywalking-$(subst docker.,,$@):$(TAG) -f Dockerfile$(suffix $@) .) # for each docker.XXX target create a push.docker.XXX target that pushes # the local docker image to another hub diff --git a/docker/.env b/docker/.env index e3acece..dd1f3e6 100644 --- a/docker/.env +++ b/docker/.env @@ -1,3 +1,3 @@ ES_VERSION=7.4.2 -OAP_IMAGE=skywalking/oap:latest -UI_IMAGE=skywalking/ui:latest +OAP_IMAGE=skywalking/skywalking-oap-server:latest +UI_IMAGE=skywalking/skywalking-ui:latest diff --git a/docker/README.md b/docker/README.md index 640dec4..0466bab 100644 --- a/docker/README.md +++ b/docker/README.md @@ -19,8 +19,8 @@ workspace, build artifact from scratch. It builds two images, OAP, and UI. ```shell docker image ls | grep skywalking -skywalking/ui latest a14db4e1d70d 6 minutes ago 800MB -skywalking/oap latest 2a6084450b44 6 minutes ago 862MB +skywalking/skywalking-ui latest a14db4e1d70d 6 minutes ago 800MB +skywalking/skywalking-oap-server latest 2a6084450b44 6 minutes ago 862MB ``` ## Building variables diff --git a/docker/oap/Dockerfile.oap b/docker/oap/Dockerfile.oap-server similarity index 100% rename from docker/oap/Dockerfile.oap rename to docker/oap/Dockerfile.oap-server 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 2d004b4..7e2cea9 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 @@ -25,6 +25,6 @@ services: SW_OAP_ADDRESS: http://oap:12800 expose: - '8080' - image: skywalking/ui:latest + image: skywalking/skywalking-ui:latest networks: - - e2e \ No newline at end of file + - e2e diff --git a/test/e2e/e2e-common/src/test/resources/docker-compose.two.yml b/test/e2e/e2e-common/src/test/resources/docker-compose.two.yml index 7f8d655..90e06af 100644 --- a/test/e2e/e2e-common/src/test/resources/docker-compose.two.yml +++ b/test/e2e/e2e-common/src/test/resources/docker-compose.two.yml @@ -18,7 +18,7 @@ version: '2.1' services: oap: - image: skywalking/oap:latest + image: skywalking/skywalking-oap-server:latest expose: - 11800 - 12800 diff --git a/test/e2e/e2e-test/docker/base-compose.yml b/test/e2e/e2e-test/docker/base-compose.yml index d9077a3..6dd1d2e 100644 --- a/test/e2e/e2e-test/docker/base-compose.yml +++ b/test/e2e/e2e-test/docker/base-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: oap: - image: skywalking/oap:latest + image: skywalking/skywalking-oap-server:latest expose: - 11800 - 12800 @@ -40,7 +40,7 @@ services: retries: 120 ui: - image: skywalking/ui:latest + image: skywalking/skywalking-ui:latest expose: - 8080 networks:
