From 4c74fbeb01bb6e165c53dd16dbd61a10fe34e40b Mon Sep 17 00:00:00 2001 From: Hermann Mayer Date: Mon, 21 Oct 2024 08:51:52 +0200 Subject: [PATCH] Improved the local build process. Signed-off-by: Hermann Mayer --- RELEASE.2023-01-25T00-19-54Z/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/RELEASE.2023-01-25T00-19-54Z/Makefile b/RELEASE.2023-01-25T00-19-54Z/Makefile index e8fb09b..79128a3 100644 --- a/RELEASE.2023-01-25T00-19-54Z/Makefile +++ b/RELEASE.2023-01-25T00-19-54Z/Makefile @@ -12,7 +12,6 @@ CANONICAL_NAME ?= minio IMAGE_NAME ?= hausgold/$(CANONICAL_NAME) IMAGE_REF ?= RELEASE.2023-01-25T00-19-54Z IMAGE_URI := $(IMAGE_NAME):$(IMAGE_REF) -TEST_CONTAINER_NAME ?= $(CANONICAL_NAME)-test # Host binaries CURL ?= curl @@ -44,7 +43,7 @@ all: build: clean # Build the Docker image - @$(TIME) $(DOCKER) build --no-cache -t "$(IMAGE_NAME):dev" . + @$(TIME) $(DOCKER) build --no-cache -t "$(IMAGE_URI)" . test: # Test the built Docker image @@ -53,13 +52,12 @@ test: publish: # Push the new Docker image to the registry - @$(DOCKER) tag "$(IMAGE_NAME):dev" "$(IMAGE_URI)" @$(call retry,$(TIME) $(SHELL) -c '$(DOCKER) push $(IMAGE_URI)') shell: # Start an individual test session of the image - @$(DOCKER) run --rm -it "$(IMAGE_NAME):dev" bash + @$(DOCKER) run --rm -it "$(IMAGE_URI)" bash clean: # Clean the current development snapshot - @$(DOCKER) rmi --force "$(IMAGE_NAME):dev" || true + @$(DOCKER) rmi --force "$(IMAGE_URI)" || true