From 971968cb60ad0ee35ca72a890f73b01acc1dfc81 Mon Sep 17 00:00:00 2001 From: Edmund Grimley Evans Date: Thu, 17 Aug 2023 11:01:16 +0100 Subject: [PATCH] Revert "Fix docker images name" This reverts commit f5af8054ddc8e72b1758d2f47f900cac69cf4711. --- docker/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 2e1ab63b8..ac5ffefd6 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -105,7 +105,7 @@ localci-exec: docker exec -i -t $(CONTAINER)-localci-$(USER)-$(VERSION) /bin/bash || true localci-base: ci/Dockerfile.local ci-base - $(DOCKER_BUILD_CMD) $(BUILD_ARGS) -t $(IMAGE)/localci/$(USER):$(VERSION) -f $< . + $(DOCKER_BUILD_CMD) $(BUILD_ARGS) -t $(IMAGE)/localci:$(VERSION) -f $< . .PHONY: all-ci all-ci: ci-image localci-base @@ -126,7 +126,7 @@ linux-exec: .PHONY: linux-base: linux/Dockerfile base - $(DOCKER_BUILD_CMD) $(BUILD_ARGS) -t $(IMAGE)/linux/$(USER):$(VERSION) -f $< . + $(DOCKER_BUILD_CMD) $(BUILD_ARGS) -t $(IMAGE)/linux:$(VERSION) -f $< . ##################################################################### # Nitro-related targets @@ -168,4 +168,4 @@ endif (git fetch ; git checkout $(AWS_NITRO_CLI_REVISION)) make -C aws-nitro-enclaves-cli HOST_MACHINE=$(ARCH) nitro-cli $(DOCKER_BUILD_CMD) $(BUILD_ARGS) \ - --build-arg NE_GID=$(NE_GID) -t $(IMAGE)/nitro/$(USER):$(VERSION) -f $< . + --build-arg NE_GID=$(NE_GID) -t $(IMAGE)/nitro:$(VERSION) -f $< .