From 46f55058ff632f877cbd11af96e0e08ad91e71a1 Mon Sep 17 00:00:00 2001 From: Aman Deep Saxena Date: Thu, 16 May 2024 16:56:44 +0530 Subject: [PATCH 1/4] Makfile changes - Adding multi arch build support for docker image Signed-off-by: Aman Deep Saxena --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Makefile b/Makefile index 39de8e6a2..94e8a5033 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,7 @@ help: @echo "\tmake push -- pushes the litmus-go multi-arch image" @echo "\tmake build-amd64 -- builds the litmus-go binary & docker amd64 image" @echo "\tmake push-amd64 -- pushes the litmus-go amd64 image" + @echo "\tpush-arm64 -- pushes the litmus-go arm64 image" @echo "" .PHONY: all @@ -90,6 +91,17 @@ push-amd64: @echo "------------------------------" @sudo docker push $(DOCKER_REGISTRY)/$(DOCKER_REPO)/$(DOCKER_IMAGE):$(DOCKER_TAG) +.PHONY: push-arm64 +push-arm64: docker.buildx image-push-arm64 + +image-push-arm64: + @echo "------------------------" + @echo "--> Push go-runner image" + @echo "------------------------" + @echo "Pushing $(DOCKER_REPO)/$(DOCKER_IMAGE):$(DOCKER_TAG)" + @docker buildx build . --push --file build/Dockerfile --progress plane --platform linux/arm64,linux/amd64 --no-cache --tag $(DOCKER_REGISTRY)/$(DOCKER_REPO)/$(DOCKER_IMAGE):$(DOCKER_TAG) + + .PHONY: trivy-check trivy-check: From 0b08293ccf7b4d1b3a58a763d56d7f3b4cdce042 Mon Sep 17 00:00:00 2001 From: Aman Deep Saxena Date: Thu, 16 May 2024 17:20:35 +0530 Subject: [PATCH 2/4] Makfile changes - Adding multi arch build support for docker image Signed-off-by: Aman Deep Saxena --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 94e8a5033..f4a5cad02 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ help: @echo "\tmake push -- pushes the litmus-go multi-arch image" @echo "\tmake build-amd64 -- builds the litmus-go binary & docker amd64 image" @echo "\tmake push-amd64 -- pushes the litmus-go amd64 image" - @echo "\tpush-arm64 -- pushes the litmus-go arm64 image" + @echo "\tpush-multiarch -- pushes the litmus-go multiarch image" @echo "" .PHONY: all @@ -91,8 +91,8 @@ push-amd64: @echo "------------------------------" @sudo docker push $(DOCKER_REGISTRY)/$(DOCKER_REPO)/$(DOCKER_IMAGE):$(DOCKER_TAG) -.PHONY: push-arm64 -push-arm64: docker.buildx image-push-arm64 +.PHONY: push-multiarch +push-multiarch: docker.buildx image-push-multiarch image-push-arm64: @echo "------------------------" From 6c5110b3fb1b44e56c9aa7f83eac524cf0ddd1bc Mon Sep 17 00:00:00 2001 From: Aman Deep Saxena Date: Thu, 16 May 2024 17:22:15 +0530 Subject: [PATCH 3/4] Makfile changes - Adding multi arch build support for docker image Signed-off-by: Aman Deep Saxena --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f4a5cad02..324df29b9 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ help: @echo "\tmake push -- pushes the litmus-go multi-arch image" @echo "\tmake build-amd64 -- builds the litmus-go binary & docker amd64 image" @echo "\tmake push-amd64 -- pushes the litmus-go amd64 image" - @echo "\tpush-multiarch -- pushes the litmus-go multiarch image" + @echo "\tpush-multiarch -- pushes the litmus-go multiarch image" @echo "" .PHONY: all From 617e4459d3042149bcd68af0c75894a226b6bd72 Mon Sep 17 00:00:00 2001 From: Aman Deep Saxena Date: Thu, 16 May 2024 17:22:40 +0530 Subject: [PATCH 4/4] Makfile changes - Adding multi arch build support for docker image Signed-off-by: Aman Deep Saxena --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 324df29b9..a2c04c994 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ help: @echo "\tmake push -- pushes the litmus-go multi-arch image" @echo "\tmake build-amd64 -- builds the litmus-go binary & docker amd64 image" @echo "\tmake push-amd64 -- pushes the litmus-go amd64 image" - @echo "\tpush-multiarch -- pushes the litmus-go multiarch image" + @echo "\tpush-multiarch -- pushes the litmus-go multiarch image" @echo "" .PHONY: all