Skip to content

GitLab

Commit 4be0c1a2 authored by songlinfeng's avatar songlinfeng 💬
Browse files

change docker.mk

parent 3120114b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
docker/docker.mk
View file @ 4be0c1a2
...@@ -67,7 +67,7 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \ ...@@ -67,7 +67,7 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \
--%: TARGET_PLATFORM = $(*) --%: TARGET_PLATFORM = $(*)
--%: VERSION = $(patsubst $(OS)%-$(ARCH),%,$(TARGET_PLATFORM)) --%: VERSION = $(patsubst $(OS)%-$(ARCH),%,$(TARGET_PLATFORM))
--%: BASEIMAGE ?= $(OS):$(VERSION) --%: BASEIMAGE ?= $(OS):$(VERSION)
--%: BUILDIMAGE = dtk/$(LIB_NAME)/$(OS)$(VERSION)-$(ARCH) --%: BUILDIMAGE = dcu/$(LIB_NAME)/$(OS)$(VERSION)-$(ARCH)
--%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.$(OS) --%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.$(OS)
--%: ARTIFACTS_DIR = $(DIST_DIR)/$(OS)$(VERSION)/$(ARCH) --%: ARTIFACTS_DIR = $(DIST_DIR)/$(OS)$(VERSION)/$(ARCH)
--%: docker-build-% --%: docker-build-%
...@@ -133,7 +133,7 @@ docker-build-%: ...@@ -133,7 +133,7 @@ docker-build-%:
$(BUILDIMAGE) $(BUILDIMAGE)
docker-clean: docker-clean:
IMAGES=$$(docker images "dtk/$(LIB_NAME)/*" --format="{{.ID}}"); \ IMAGES=$$(docker images "dcu/$(LIB_NAME)/*" --format="{{.ID}}"); \
if [ "$${IMAGES}" != "" ]; then \ if [ "$${IMAGES}" != "" ]; then \
docker rmi -f $${IMAGES}; \ docker rmi -f $${IMAGES}; \
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment