[v11] Use Teleport's standard buildbox

build.assets/Makefile

@@ -21,7 +21,6 @@ TEST_KUBE ?=
 
 OS ?= linux
 ARCH ?= amd64
-BUILDBOX_VERSION ?= teleport11
 
 GOLANG_VERSION ?= go1.19.2
 
@@ -47,13 +46,8 @@ PROTOC_VER ?= 3.20.1
 # Keep in sync with api/proto/buf.yaml (and buf.lock).
 GOGO_PROTO_TAG ?= v1.3.2
 
-BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox:$(BUILDBOX_VERSION)
-BUILDBOX_FIPS=public.ecr.aws/gravitational/teleport-buildbox-fips:$(BUILDBOX_VERSION)
-BUILDBOX_CENTOS7=public.ecr.aws/gravitational/teleport-buildbox-centos7:$(BUILDBOX_VERSION)
-BUILDBOX_CENTOS7_FIPS=public.ecr.aws/gravitational/teleport-buildbox-centos7-fips:$(BUILDBOX_VERSION)
-BUILDBOX_ARM=public.ecr.aws/gravitational/teleport-buildbox-arm:$(BUILDBOX_VERSION)
-BUILDBOX_ARM_FIPS=public.ecr.aws/gravitational/teleport-buildbox-arm-fips:$(BUILDBOX_VERSION)
-BUILDBOX_TELETERM=public.ecr.aws/gravitational/teleport-buildbox-teleterm:$(BUILDBOX_VERSION)
+# BUILDBOX_VERSION, BUILDBOX and BUILDBOX_variant variables are included
+include images.mk
 
 # These variables are used to dynamically change the name of the buildbox Docker image used by the 'release'
 # target. The other solution was to remove the 'buildbox' dependency from the 'release' target, but this would

build.assets/images.mk

@@ -0,0 +1,11 @@
+# Those variables are extracted from build.assets/Makefile so they can be imported
+# by other Makefiles
+BUILDBOX_VERSION ?= teleport11
+
+BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox:$(BUILDBOX_VERSION)
+BUILDBOX_FIPS=public.ecr.aws/gravitational/teleport-buildbox-fips:$(BUILDBOX_VERSION)
+BUILDBOX_CENTOS7=public.ecr.aws/gravitational/teleport-buildbox-centos7:$(BUILDBOX_VERSION)
+BUILDBOX_CENTOS7_FIPS=public.ecr.aws/gravitational/teleport-buildbox-centos7-fips:$(BUILDBOX_VERSION)
+BUILDBOX_ARM=public.ecr.aws/gravitational/teleport-buildbox-arm:$(BUILDBOX_VERSION)
+BUILDBOX_ARM_FIPS=public.ecr.aws/gravitational/teleport-buildbox-arm-fips:$(BUILDBOX_VERSION)
+BUILDBOX_TELETERM=public.ecr.aws/gravitational/teleport-buildbox-teleterm:$(BUILDBOX_VERSION)

docker/Dockerfile

@@ -1,6 +1,5 @@
-# The base image (buildbox:latest) is built by running `make -C build.assets`
-# from the base repo directory $GOPATH/gravitational.com/teleport
-FROM public.ecr.aws/gravitational/teleport-buildbox:teleport11
+ARG BUILDBOX
+FROM $BUILDBOX
 
 # DEBUG=1 is needed for the Web UI to be loaded from static assets instead
 # of the binary

docker/Makefile

@@ -5,6 +5,9 @@ PRO_LICENSE ?= ../e/fixtures/license-pro.pem
 # whether to look for enterprise or pro license
 MODE ?= enterprise
 
+# include BUILDBOX_VERSION, BUILDBOX and BUILDBOX_variant variables
+include ../build.assets/images.mk
+
 #
 # Default target starts two Teleport clusters
 #
@@ -82,7 +85,7 @@ check-license:
 
 .PHONY: build
 build:
-	docker build -t teleport:latest .
+	docker build --build-arg BUILDBOX=$(BUILDBOX) -t teleport:latest .
 
 .PHONY: clean
 clean:

operator/Dockerfile

@@ -1,7 +1,8 @@
-# Build the manager binary
-FROM golang:1.19 as builder
+ARG BUILDBOX
+FROM $BUILDBOX as builder
+
+WORKDIR /go/src/github.com/gravitational/teleport
 
-WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
@@ -22,10 +23,10 @@ COPY operator/main.go operator/main.go
 COPY operator/namespace.go operator/namespace.go
 
 # Build
-RUN GOOS=linux GOARCH=amd64 go build -a -o teleport-operator github.com/gravitational/teleport/operator
+RUN GOOS=linux GOARCH=amd64 go build -a -o /go/bin/teleport-operator github.com/gravitational/teleport/operator
 
 FROM gcr.io/distroless/cc
 WORKDIR /
-COPY --from=builder /workspace/teleport-operator .
+COPY --from=builder /go/bin/teleport-operator .
 
 ENTRYPOINT ["/teleport-operator"]

operator/Makefile

@@ -5,49 +5,9 @@
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
 VERSION ?= 0.0.1
 
-# CHANNELS define the bundle channels used in the bundle.
-# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
-# To re-generate a bundle for other specific channels without changing the standard setup, you can:
-# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable)
-# - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable")
-ifneq ($(origin CHANNELS), undefined)
-BUNDLE_CHANNELS := --channels=$(CHANNELS)
-endif
-
-# DEFAULT_CHANNEL defines the default channel used in the bundle.
-# Add a new line here if you would like to change its default config. (E.g DEFAULT_CHANNEL = "stable")
-# To re-generate a bundle for any other default channel without changing the default setup, you can:
-# - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable)
-# - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable")
-ifneq ($(origin DEFAULT_CHANNEL), undefined)
-BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
-endif
-BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
-
-# IMAGE_TAG_BASE defines the docker.io namespace and part of the image name for remote images.
-# This variable is used to construct full image tags for bundle and catalog images.
-#
-# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
-# teleport.dev/operator-bundle:$VERSION and teleport.dev/operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= teleport.dev/operator
-
-# BUNDLE_IMG defines the image:tag used for the bundle.
-# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
-BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
-
-# BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command
-BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
-
-# USE_IMAGE_DIGESTS defines if images are resolved via tags or digests
-# You can enable this value if you would like to use SHA Based Digests
-# To enable set flag to true
-USE_IMAGE_DIGESTS ?= false
-ifeq ($(USE_IMAGE_DIGESTS), true)
-	BUNDLE_GEN_FLAGS += --use-image-digests
-endif
-
 # Image URL to use all building/pushing image targets
 IMG ?= teleport-operator:latest
+
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.23
 
@@ -57,6 +17,9 @@ ENVTEST_K8S_VERSION = 1.23
 SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
 
+# include BUILDBOX_VERSION, BUILDBOX and BUILDBOX_variant variables
+include ../build.assets/images.mk
+
 .PHONY: all
 all: build
 
@@ -140,7 +103,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
 
 .PHONY: docker-build
 docker-build: ## Build docker image with the manager.
-	docker build -t ${IMG} .. -f ./Dockerfile
+	docker build --build-arg BUILDBOX=$(BUILDBOX) -t ${IMG} .. -f ./Dockerfile
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.