integrations: allow multiarch image builds

build.assets/images.mk

@@ -13,3 +13,7 @@ BUILDBOX_ARM=$(BUILDBOX_BASE_NAME)-arm:$(BUILDBOX_VERSION)
 BUILDBOX_ARM_FIPS=$(BUILDBOX_BASE_NAME)-arm-fips:$(BUILDBOX_VERSION)
 BUILDBOX_UI=$(BUILDBOX_BASE_NAME)-ui:$(BUILDBOX_VERSION)
 BUILDBOX_CENTOS7_ASSETS=$(BUILDBOX_BASE_NAME)-centos7-assets:$(BUILDBOX_VERSION)
+
+.PHONY:show-buildbox-base-image
+show-buildbox-base-image:
+	@echo "$(BUILDBOX)"

integrations/kube-agent-updater/Dockerfile

@@ -1,4 +1,5 @@
 ARG BUILDBOX
+ARG BASE_IMAGE=gcr.io/distroless/static-debian11
 # BUILDPLATFORM is provided by Docker/buildx
 FROM --platform=$BUILDPLATFORM $BUILDBOX as builder
 
@@ -16,20 +17,17 @@ RUN go mod download
 COPY cmd/ cmd/
 COPY pkg/ pkg/
 
-# Compiler package should use host-triplet-agnostic name (i.e. "x86-64-linux-gnu-gcc" instead of "gcc")
-#  in most cases, to avoid issues on systems with multiple versions of gcc (i.e. buildboxes)
-# TARGETOS and TARGETARCH are provided by Docker/buildx, but must be explicitly listed here
-ARG COMPILER_NAME TARGETOS TARGETARCH
+ARG TARGETOS
+ARG TARGETARCH
 
-# Build the program
-# CGO is required for github.com/gravitational/teleport/lib/system
-RUN echo "Targeting $TARGETOS/$TARGETARCH with CC=$COMPILER_NAME" && \
-    CGO_ENABLED=1 CC=$COMPILER_NAME GOOS=$TARGETOS GOARCH=$TARGETARCH \
+# Build the program. We rely on golang's cross-compilation capabilities for multiarch building.
+RUN echo "Targeting $TARGETOS/$TARGETARCH" && \
+    GOOS=$TARGETOS GOARCH=$TARGETARCH \
     go build -a -o /go/bin/teleport-kube-agent-updater github.com/gravitational/teleport/integrations/kube-agent-updater/cmd/teleport-kube-agent-updater
 
 # Create the image with the build operator on the $TARGETPLATFORM
 # TARGETPLATFORM is provided by Docker/buildx
-FROM --platform=$TARGETPLATFORM gcr.io/distroless/cc
+FROM --platform=$TARGETPLATFORM $BASE_IMAGE
 WORKDIR /
 COPY --from=builder /go/bin/teleport-kube-agent-updater .
 

integrations/kube-agent-updater/Makefile

@@ -7,30 +7,15 @@ include ../../build.assets/images.mk
 # Configure which compiler and buildbox to use
 OS ?= $(shell go env GOOS)
 ARCH ?= $(shell go env GOARCH)
-ifeq ("$(OS)","linux")
-ifeq ("$(ARCH)","amd64")
-COMPILER ?= x86_64-linux-gnu-gcc
-PLATFORM_BUILDBOX ?= $(BUILDBOX)
-else ifeq ("$(ARCH)","386")
-COMPILER ?= x86_64-linux-gnu-gcc
-PLATFORM_BUILDBOX ?= $(BUILDBOX)
-else ifeq ("$(ARCH)","arm")
-COMPILER ?= arm-linux-gnueabihf-gcc
-PLATFORM_BUILDBOX ?= $(BUILDBOX_ARM)
-else ifeq ("$(ARCH)","arm64")
-COMPILER ?= aarch64-linux-gnu-gcc
-PLATFORM_BUILDBOX ?= $(BUILDBOX_ARM)
-endif
-endif
 
 .PHONY: test
 test: pkg/img/cosign_fixtures_test.go
 	go test ./...
 
 .PHONY: docker-build
 docker-build: ## Build docker image
-	docker buildx build --platform="$(OS)/$(ARCH)" --build-arg BUILDBOX=$(PLATFORM_BUILDBOX) \
-		--build-arg COMPILER_NAME=$(COMPILER) -t ${IMG} --load ./ -f ./Dockerfile
+	docker buildx build --platform="$(OS)/$(ARCH)" --build-arg BUILDBOX=$(BUILDBOX) \
+		-t ${IMG} --load ./ -f ./Dockerfile
 
 .PHONY: docker-push
 docker-push: ## Push docker image

integrations/operator/Dockerfile

@@ -1,4 +1,5 @@
 ARG BUILDBOX
+ARG BASE_IMAGE=gcr.io/distroless/static-debian11
 # BUILDPLATFORM is provided by Docker/buildx
 FROM --platform=$BUILDPLATFORM $BUILDBOX as builder
 
@@ -25,20 +26,17 @@ COPY integrations/operator/sidecar/ integrations/operator/sidecar/
 COPY integrations/operator/main.go integrations/operator/main.go
 COPY integrations/operator/namespace.go integrations/operator/namespace.go
 
-# Compiler package should use host-triplet-agnostic name (i.e. "x86-64-linux-gnu-gcc" instead of "gcc")
-#  in most cases, to avoid issues on systems with multiple versions of gcc (i.e. buildboxes)
-# TARGETOS and TARGETARCH are provided by Docker/buildx, but must be explicitly listed here
-ARG COMPILER_NAME TARGETOS TARGETARCH
+ARG TARGETOS
+ARG TARGETARCH
 
-# Build the program
-# CGO is required for github.com/gravitational/teleport/lib/system
-RUN echo "Targeting $TARGETOS/$TARGETARCH with CC=$COMPILER_NAME" && \
-    CGO_ENABLED=1 CC=$COMPILER_NAME GOOS=$TARGETOS GOARCH=$TARGETARCH \
+# Build the program. We rely on golang's cross-compilation capabilities for multiarch building.
+RUN echo "Targeting $TARGETOS/$TARGETARCH" && \
+    GOOS=$TARGETOS GOARCH=$TARGETARCH \
     go build -a -o /go/bin/teleport-operator github.com/gravitational/teleport/integrations/operator
 
 # Create the image with the build operator on the $TARGETPLATFORM
 # TARGETPLATFORM is provided by Docker/buildx
-FROM --platform=$TARGETPLATFORM gcr.io/distroless/cc
+FROM --platform=$TARGETPLATFORM $BASE_IMAGE
 WORKDIR /
 COPY --from=builder /go/bin/teleport-operator .
 

integrations/operator/Makefile

@@ -23,21 +23,6 @@ include ./envtest.mk
 # Configure which compiler and buildbox to use
 OS ?= $(shell go env GOOS)
 ARCH ?= $(shell go env GOARCH)
-ifeq ("$(OS)","linux")
-ifeq ("$(ARCH)","amd64")
-COMPILER ?= x86_64-linux-gnu-gcc
-PLATFORM_BUILDBOX ?= $(BUILDBOX)
-else ifeq ("$(ARCH)","386")
-COMPILER ?= x86_64-linux-gnu-gcc
-PLATFORM_BUILDBOX ?= $(BUILDBOX)
-else ifeq ("$(ARCH)","arm")
-COMPILER ?= arm-linux-gnueabihf-gcc
-PLATFORM_BUILDBOX ?= $(BUILDBOX_ARM)
-else ifeq ("$(ARCH)","arm64")
-COMPILER ?= aarch64-linux-gnu-gcc
-PLATFORM_BUILDBOX ?= $(BUILDBOX_ARM)
-endif
-endif
 
 .PHONY: all
 all: build
@@ -125,8 +110,8 @@ run: manifests generate fmt vet ## Run a controller from your host.
 
 .PHONY: docker-build
 docker-build: ## Build docker image with the manager.
-	docker buildx build --platform="$(OS)/$(ARCH)" --build-arg BUILDBOX=$(PLATFORM_BUILDBOX) \
-		--build-arg COMPILER_NAME=$(COMPILER) -t ${IMG} --load ../.. -f ./Dockerfile
+	docker buildx build --platform="$(OS)/$(ARCH)" --build-arg BUILDBOX=$(BUILDBOX) \
+		-t ${IMG} --load ../.. -f ./Dockerfile
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.