From e465c9439722e017ac310063d2f954525b607287 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 29 Oct 2025 15:49:12 -0400 Subject: [PATCH 1/9] Add arm64 make targets. Signed-off-by: Josh Baird --- Makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f49e2e87b..b978df538 100644 --- a/Makefile +++ b/Makefile @@ -130,20 +130,32 @@ build-fb-debug: prepare-build # Build all amd64 docker images build-amd64: build-op-amd64 build-fb-amd64 build-fd-amd64 +# Build all arm64 docker images +build-arm64: build-op-arm64 build-fb-arm64 build-fd-arm64 + # Build amd64 Fluent Operator container image build-op-amd64: docker build --platform=linux/amd64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG} +# Build arm64 Fluent Operator container image +build-op-amd64: + docker build --platform=linux/arm64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG} + # Build amd64 Fluent Bit container image build-fb-amd64: docker build --platform=linux/amd64 -f cmd/fluent-watcher/fluentbit/Dockerfile . -t ${FB_IMG} +# Build arm64 Fluent Bit container image +build-fb-amd64: + docker build --platform=linux/arm64 -f cmd/fluent-watcher/fluentbit/Dockerfile . -t ${FB_IMG} + # Build amd64 Fluentd container image build-fd-amd64: docker build --platform=linux/amd64 -f cmd/fluent-watcher/fluentd/Dockerfile.amd64 . -t ${FD_IMG} -build-fd-arm64-base: prepare-build - docker buildx build --push --platform linux/arm64 -f cmd/fluent-watcher/fluentd/Dockerfile.arm64.base . -t ${FD_IMG_BASE} +# Build arm64 Fluentd container image +build-fd-amd64: + docker build --platform=linux/arm64 -f cmd/fluent-watcher/fluentd/Dockerfile.amd64 . -t ${FD_IMG} # Use docker buildx to build arm64 Fluentd container image build-fd-arm64: prepare-build From 62a9f5ae8c93fc8e11ec7ee26af06a12057aac72 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Thu, 30 Oct 2025 08:37:55 -0400 Subject: [PATCH 2/9] Update Makefile Co-authored-by: Marco Franssen Signed-off-by: Josh Baird --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index b978df538..f5e8da5a1 100644 --- a/Makefile +++ b/Makefile @@ -131,6 +131,7 @@ build-fb-debug: prepare-build build-amd64: build-op-amd64 build-fb-amd64 build-fd-amd64 # Build all arm64 docker images +PHONY: build-arm64 build-arm64: build-op-arm64 build-fb-arm64 build-fd-arm64 # Build amd64 Fluent Operator container image From 5c695aef5b52a932c832f7d82bc9b0bac6da2e34 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Thu, 30 Oct 2025 08:38:03 -0400 Subject: [PATCH 3/9] Update Makefile Co-authored-by: Marco Franssen Signed-off-by: Josh Baird --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index f5e8da5a1..6eb2a0388 100644 --- a/Makefile +++ b/Makefile @@ -135,6 +135,7 @@ PHONY: build-arm64 build-arm64: build-op-arm64 build-fb-arm64 build-fd-arm64 # Build amd64 Fluent Operator container image +.PHONY: build-op-amd64 build-op-amd64: docker build --platform=linux/amd64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG} From cb329f8aa9f1cf07fb8a9aa040d0f15621f25e41 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Thu, 30 Oct 2025 08:38:12 -0400 Subject: [PATCH 4/9] Update Makefile Co-authored-by: Marco Franssen Signed-off-by: Josh Baird --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 6eb2a0388..28c959e4d 100644 --- a/Makefile +++ b/Makefile @@ -140,6 +140,7 @@ build-op-amd64: docker build --platform=linux/amd64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG} # Build arm64 Fluent Operator container image +PHONY: build-op-amd64 build-op-amd64: docker build --platform=linux/arm64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG} From c3b7a0518f41c3371f1a62d9598f2aefaa2db308 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Thu, 30 Oct 2025 08:38:20 -0400 Subject: [PATCH 5/9] Update Makefile Co-authored-by: Marco Franssen Signed-off-by: Josh Baird --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 28c959e4d..236d15227 100644 --- a/Makefile +++ b/Makefile @@ -149,7 +149,8 @@ build-fb-amd64: docker build --platform=linux/amd64 -f cmd/fluent-watcher/fluentbit/Dockerfile . -t ${FB_IMG} # Build arm64 Fluent Bit container image -build-fb-amd64: +PHONY: build-fb-arm64 +build-fb-arm64: docker build --platform=linux/arm64 -f cmd/fluent-watcher/fluentbit/Dockerfile . -t ${FB_IMG} # Build amd64 Fluentd container image From dc6eacd874c9a3db675dd4911d188fcea7b93a25 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Thu, 30 Oct 2025 08:38:27 -0400 Subject: [PATCH 6/9] Update Makefile Co-authored-by: Marco Franssen Signed-off-by: Josh Baird --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 236d15227..dafd6d31d 100644 --- a/Makefile +++ b/Makefile @@ -128,6 +128,7 @@ build-fb-debug: prepare-build docker buildx build --push --platform linux/amd64,linux/arm64 -f cmd/fluent-watcher/fluentbit/Dockerfile.debug . -t ${FB_IMG_DEBUG} # Build all amd64 docker images +PHONY: build-amd64 build-amd64: build-op-amd64 build-fb-amd64 build-fd-amd64 # Build all arm64 docker images From 3fe55fe6030f54f3b5bb34ade98cc76c8a1b0c4f Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Thu, 30 Oct 2025 08:38:37 -0400 Subject: [PATCH 7/9] Update Makefile Co-authored-by: Marco Franssen Signed-off-by: Josh Baird --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dafd6d31d..a97aa75c1 100644 --- a/Makefile +++ b/Makefile @@ -159,7 +159,8 @@ build-fd-amd64: docker build --platform=linux/amd64 -f cmd/fluent-watcher/fluentd/Dockerfile.amd64 . -t ${FD_IMG} # Build arm64 Fluentd container image -build-fd-amd64: +PHONY: build-fd-arm64 +build-fd-arm64: docker build --platform=linux/arm64 -f cmd/fluent-watcher/fluentd/Dockerfile.amd64 . -t ${FD_IMG} # Use docker buildx to build arm64 Fluentd container image From ca24dfc80e522fb84d7dee9a410345bb33164264 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Thu, 30 Oct 2025 13:37:05 -0400 Subject: [PATCH 8/9] Fix PHONY. Signed-off-by: Josh Baird --- Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index a97aa75c1..110cf10e8 100644 --- a/Makefile +++ b/Makefile @@ -117,22 +117,25 @@ run: manifests generate fmt vet ## Run a controller from your host. go run cmd/fluent-manager/main.go # Build amd64/arm64 Fluent Operator container image +.PHONY: build-op build-op: docker buildx build --push --platform linux/amd64,linux/arm64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG} # Build amd64/arm64 Fluent Bit container image +.PHONY: build-fb build-fb: prepare-build docker buildx build --push --platform linux/amd64,linux/arm64 -f cmd/fluent-watcher/fluentbit/Dockerfile . -t ${FB_IMG} +.PHONY: build-fb-debug build-fb-debug: prepare-build docker buildx build --push --platform linux/amd64,linux/arm64 -f cmd/fluent-watcher/fluentbit/Dockerfile.debug . -t ${FB_IMG_DEBUG} # Build all amd64 docker images -PHONY: build-amd64 +.PHONY: build-amd64 build-amd64: build-op-amd64 build-fb-amd64 build-fd-amd64 # Build all arm64 docker images -PHONY: build-arm64 +.PHONY: build-arm64 build-arm64: build-op-arm64 build-fb-arm64 build-fd-arm64 # Build amd64 Fluent Operator container image @@ -141,32 +144,30 @@ build-op-amd64: docker build --platform=linux/amd64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG} # Build arm64 Fluent Operator container image -PHONY: build-op-amd64 +.PHONY: build-op-amd64 build-op-amd64: docker build --platform=linux/arm64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG} # Build amd64 Fluent Bit container image +.PHONY: build-fb-amd64 build-fb-amd64: docker build --platform=linux/amd64 -f cmd/fluent-watcher/fluentbit/Dockerfile . -t ${FB_IMG} # Build arm64 Fluent Bit container image -PHONY: build-fb-arm64 +.PHONY: build-fb-arm64 build-fb-arm64: docker build --platform=linux/arm64 -f cmd/fluent-watcher/fluentbit/Dockerfile . -t ${FB_IMG} # Build amd64 Fluentd container image +.PHONY: build-fd-amd64 build-fd-amd64: docker build --platform=linux/amd64 -f cmd/fluent-watcher/fluentd/Dockerfile.amd64 . -t ${FD_IMG} # Build arm64 Fluentd container image -PHONY: build-fd-arm64 +.PHONY: build-fd-arm64 build-fd-arm64: docker build --platform=linux/arm64 -f cmd/fluent-watcher/fluentd/Dockerfile.amd64 . -t ${FD_IMG} -# Use docker buildx to build arm64 Fluentd container image -build-fd-arm64: prepare-build - docker buildx build --push --platform linux/arm64 -f cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick . -t ${FD_IMG}${ARCH} --build-arg ${FD_IMG_BASE} --build-arg ${FD_IMG_BASE_TAG} - # Prepare for arm64 building prepare-build: cmd/fluent-watcher/hooks/post-hook.sh From c16e10ed5c1d58e63b0d73471ee77aded938cfd7 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Fri, 7 Nov 2025 15:03:15 -0500 Subject: [PATCH 9/9] Fix copy/paste. Signed-off-by: Josh Baird --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 110cf10e8..4f3ddcd8e 100644 --- a/Makefile +++ b/Makefile @@ -144,8 +144,8 @@ build-op-amd64: docker build --platform=linux/amd64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG} # Build arm64 Fluent Operator container image -.PHONY: build-op-amd64 -build-op-amd64: +.PHONY: build-op-arm64 +build-op-arm64: docker build --platform=linux/arm64 -f cmd/fluent-manager/Dockerfile . -t ${FO_IMG} # Build amd64 Fluent Bit container image @@ -161,12 +161,12 @@ build-fb-arm64: # Build amd64 Fluentd container image .PHONY: build-fd-amd64 build-fd-amd64: - docker build --platform=linux/amd64 -f cmd/fluent-watcher/fluentd/Dockerfile.amd64 . -t ${FD_IMG} + docker build --platform=linux/amd64 -f cmd/fluent-watcher/fluentd/Dockerfile . -t ${FD_IMG} # Build arm64 Fluentd container image .PHONY: build-fd-arm64 build-fd-arm64: - docker build --platform=linux/arm64 -f cmd/fluent-watcher/fluentd/Dockerfile.amd64 . -t ${FD_IMG} + docker build --platform=linux/arm64 -f cmd/fluent-watcher/fluentd/Dockerfile . -t ${FD_IMG} # Prepare for arm64 building prepare-build: