From 36a0ac629d780ee2decbce6765ab93a22dd60d8c Mon Sep 17 00:00:00 2001 From: "Borie, Niels" Date: Wed, 6 Mar 2024 23:19:24 +0100 Subject: [PATCH] wip --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 5163b01..a84e1f4 100644 --- a/Makefile +++ b/Makefile @@ -42,9 +42,9 @@ build-and-push-all-images: ## Build all machine-learning-environments docker ima @for version in $(SUPPORTED_PYTHON_VERSIONS); do \ for builder in $(ALL_BUILDERS); do \ for layer in $(ALL_LAYERS); do \ - $(MAKE) build-image REGISTRY_URL=$(REGISTRY_URL) PYTHON_VERSION=$$version LAYER=$$layer BUILDER=$$builder IMAGE_VERSION=$(IMAGE_VERSION); \ + $(MAKE) build-image PYTHON_VERSION=$$version LAYER=$$layer BUILDER=$$builder IMAGE_VERSION=$(IMAGE_VERSION); \ if [ "$(BRANCH_NAME)" = "develop" ] || [ "$(BRANCH_NAME)" = "main" ]; then \ - $(MAKE) push-image REGISTRY_URL=$(REGISTRY_URL) PYTHON_VERSION=$$version LAYER=$$layer BUILDER=$$builder IMAGE_VERSION=$(IMAGE_VERSION); \ + $(MAKE) push-image PYTHON_VERSION=$$version LAYER=$$layer BUILDER=$$builder IMAGE_VERSION=$(IMAGE_VERSION); \ fi \ done; \ $(MAKE) clean-images; \ @@ -74,23 +74,23 @@ push-all-images: ## Push all machine-learning-environments docker images to the done build-image: ## Build a single machine-learning-environments docker image (args : PYTHON_VERSION, LAYER, BUILDER, IMAGE_VERSION) - @echo "Building image using REGISTRY_URL=$(REGISTRY_URL) PYTHON_VERSION=$(PYTHON_VERSION) LAYER=$(LAYER) BUILDER=$(BUILDER) IMAGE_VERSION=$(IMAGE_VERSION)" + @echo "Building image using PYTHON_VERSION=$(PYTHON_VERSION) LAYER=$(LAYER) BUILDER=$(BUILDER) IMAGE_VERSION=$(IMAGE_VERSION)" @real_python_version=$$(jq -r '.python."$(PYTHON_VERSION)".release' package.json); \ - docker build --progress=plain --no-cache --force-rm -t $(REGISTRY_URL)/$(LAYER)-$(BUILDER)-py$(PYTHON_VERSION):$(IMAGE_VERSION) \ + docker build --progress=plain --no-cache --force-rm -t nielsborie/$(LAYER)-$(BUILDER)-py$(PYTHON_VERSION):$(IMAGE_VERSION) \ --build-arg PYTHON_RELEASE_VERSION=$$real_python_version --build-arg PYTHON_VERSION=$(PYTHON_VERSION) \ --build-arg IMAGE_VERSION=$(IMAGE_VERSION) --build-arg BUILDER=$(BUILDER) \ -f layers/$(LAYER)/$(BUILDER).Dockerfile layers/$(LAYER)/; \ push-image: ## Push machine-learning-environments image to registry (args : PYTHON_VERSION, LAYER, BUILDER, IMAGE_VERSION) - @echo "Pushing image $(REGISTRY_URL)/$(LAYER)-$(BUILDER)-py$(PYTHON_VERSION):$(IMAGE_VERSION)" - docker push $(REGISTRY_URL)/$(LAYER)-$(BUILDER)-py$(PYTHON_VERSION):$(IMAGE_VERSION) + @echo "Pushing image nielsborie/$(LAYER)-$(BUILDER)-py$(PYTHON_VERSION):$(IMAGE_VERSION)" + docker push nielsborie/$(LAYER)-$(BUILDER)-py$(PYTHON_VERSION):$(IMAGE_VERSION) if [ "${BRANCH_NAME}" = "main" ]; then \ - docker push $(REGISTRY_URL)/$(LAYER)-$(BUILDER)-py$(PYTHON_VERSION):latest; \ + docker push nielsborie/$(LAYER)-$(BUILDER)-py$(PYTHON_VERSION):latest; \ fi; ### Running environments ### docker-run: ## Run machine-learning-environments using docker image (args : PYTHON_VERSION, LAYER, BUILDER, IMAGE_VERSION) - docker run --rm -it -d --name ML-env $(REGISTRY_URL)/$(LAYER)-$(BUILDER)-py$(PYTHON_VERSION):$(IMAGE_VERSION) + docker run --rm -it -d --name ML-env nielsborie/$(LAYER)-$(BUILDER)-py$(PYTHON_VERSION):$(IMAGE_VERSION) docker-interactive: ## Enter into the machine-learning-environments container docker exec -it ML-env /bin/bash