From eae94bb4a89bb9d0cd84e4c7e9a1c54e3bc4bec1 Mon Sep 17 00:00:00 2001 From: Michael Wilkerson Date: Thu, 13 Oct 2022 09:57:03 -0700 Subject: [PATCH] try #6 --- control-plane/Makefile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/control-plane/Makefile b/control-plane/Makefile index 300da32fbb..7154b70c68 100644 --- a/control-plane/Makefile +++ b/control-plane/Makefile @@ -60,14 +60,21 @@ ci.dev-docker-github: --platform linux/amd64,linux/arm64 \ --target=dev \ --push \ - --label COMMIT_SHA=$(CIRCLE_SHA1) \ - --label PULL_REQUEST=$(CIRCLE_PULL_REQUEST) \ - --label CIRCLE_BUILD_URL=$(CIRCLE_BUILD_URL) \ + --label COMMIT_SHA=$(GITHUB_SHA) \ + --label PULL_REQUEST=$(GITHIB_PULL_REQUEST) \ + --label GITHUB_BUILD_URL=$(GITHUB_SERVER_URL)/$(GITHUB_REPOSITORY)/actions/runs/$(GITHUB_RUN_ID) \ $(CI_DEV_DOCKER_WORKDIR) -f $(CURDIR)/Dockerfile @echo "Pushed dev image to: $(CI_DEV_DOCKER_NAMESPACE)/$(CI_DEV_DOCKER_IMAGE_NAME):$(GIT_COMMIT)" ifeq ($(GITHUB_REF_NAME), main) - @docker tag $(CI_DEV_DOCKER_NAMESPACE)/$(CI_DEV_DOCKER_IMAGE_NAME):$(GIT_COMMIT) $(CI_DEV_DOCKER_NAMESPACE)/$(CI_DEV_DOCKER_IMAGE_NAME):latest - @docker push $(CI_DEV_DOCKER_NAMESPACE)/$(CI_DEV_DOCKER_IMAGE_NAME):latest + @docker buildx build -t '$(CI_DEV_DOCKER_NAMESPACE)/$(CI_DEV_DOCKER_IMAGE_NAME):latest' \ + --platform linux/amd64,linux/arm64 \ + --target=dev \ + --push \ + --label COMMIT_SHA=$(GITHUB_SHA) \ + --label PULL_REQUEST=$(GITHIB_PULL_REQUEST) \ + --label GITHUB_BUILD_URL=$(GITHUB_SERVER_URL)/$(GITHUB_REPOSITORY)/actions/runs/$(GITHUB_RUN_ID) \ + $(CI_DEV_DOCKER_WORKDIR) -f $(CURDIR)/Dockerfile + @echo "Pushed dev image to: $(CI_DEV_DOCKER_NAMESPACE)/$(CI_DEV_DOCKER_IMAGE_NAME):latest" endif .PHONY: ci.dev-tree ci.dev-docker ci.dev-docker-github