Skip to content

Commit 822f1d8

Browse files
committed
fix(logger): remove logger-build container after "docker cp"
This works around moby/moby#8632 and an error in the Makefile evaluation order logic.
1 parent d66d3b5 commit 822f1d8

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

logger/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
77

88
build: check-docker
99
docker build -t $(BUILD_IMAGE) .
10-
@$(eval CID := $(shell docker run -d $(BUILD_IMAGE)))
11-
docker cp $(CID):/go/bin/logger image/bin/
10+
docker cp `docker run -d $(BUILD_IMAGE)`:/go/bin/logger image/bin/
1211
docker build -t $(IMAGE) image
13-
-docker kill $(CID)
1412
rm -rf image/bin/logger
13+
-docker rm -f `docker ps | grep logger-build | awk '{print $$1}'`
1514

1615
clean: check-docker check-registry
1716
docker rmi $(IMAGE)

0 commit comments

Comments
 (0)