dockerfiles: update image used

Signed-off-by: Vincent Demeester <[email protected]>
openshift-pipelines · Sep 20, 2024 · 20080b8 · 20080b8
1 parent 625659f
commit 20080b8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/openshift/dockerfiles/operator.Dockerfile b/openshift/dockerfiles/operator.Dockerfile
@@ -1,7 +1,7 @@
-# FIXME: this needs to be generated
-# FROM openshift/golang-builder:rhel_8_golang_1.22 AS builder
-# FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22 AS builder
-FROM quay.io/projectquay/golang:1.22 AS builder
+ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
+ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:1b6d711648229a1c987f39cfdfccaebe2bd92d0b5d8caa5dbaa5234a9278a0b2
+
+FROM $GO_BUILDER AS builder
 
 WORKDIR /go/src/github.com/tektoncd/operator
 COPY upstream .
@@ -14,7 +14,7 @@ RUN go build -tags disable_gcp -ldflags="-X 'knative.dev/pkg/changeset.rev=${CHA
     ./cmd/openshift/operator
 # RUN /bin/sh -c 'echo $CI_OPERATOR_UPSTREAM_COMMIT > /tmp/HEAD'
 
-FROM registry.redhat.io/ubi8/ubi-minimal:latest
+FROM $RUNTIME
 
 ENV OPERATOR=/usr/local/bin/openshift-pipelines-operator \
     KO_DATA_PATH=/kodata

diff --git a/openshift/dockerfiles/proxy.Dockerfile b/openshift/dockerfiles/proxy.Dockerfile
@@ -1,7 +1,7 @@
-# FIXME: this needs to be generated
-# FROM openshift/golang-builder:rhel_8_golang_1.22 AS builder
-# FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22 AS builder
-FROM quay.io/projectquay/golang:1.22 AS builder
+ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
+ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:1b6d711648229a1c987f39cfdfccaebe2bd92d0b5d8caa5dbaa5234a9278a0b2
+
+FROM $GO_BUILDER AS builder
 
 WORKDIR /go/src/github.com/tektoncd/operator
 COPY upstream .
@@ -14,7 +14,7 @@ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=${CHANGESET_REV:0:7}'"
     ./cmd/openshift/proxy-webhook
 # RUN /bin/sh -c 'echo $CI_PIPELINE_UPSTREAM_COMMIT > /tmp/HEAD'
 
-FROM registry.redhat.io/ubi8/ubi-minimal:latest
+FROM $RUNTIME
 
 ENV OPERATOR_PROXY=/usr/local/bin/openshift-pipelines-operator-proxy \
     KO_DATA_PATH=/kodata

diff --git a/openshift/dockerfiles/webhook.Dockerfile b/openshift/dockerfiles/webhook.Dockerfile
@@ -1,7 +1,7 @@
-# FIXME: this needs to be generated
-# FROM openshift/golang-builder:rhel_8_golang_1.22 AS builder
-# FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22 AS builder
-FROM quay.io/projectquay/golang:1.22 AS builder
+ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22
+ARG RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:1b6d711648229a1c987f39cfdfccaebe2bd92d0b5d8caa5dbaa5234a9278a0b2
+
+FROM $GO_BUILDER AS builder
 
 WORKDIR /go/src/github.com/tektoncd/operator
 COPY upstream .
@@ -14,7 +14,7 @@ RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=${CHANGESET_REV:0:7}'"
     ./cmd/openshift/webhook
 # RUN /bin/sh -c 'echo $CI_PIPELINE_UPSTREAM_COMMIT > /tmp/HEAD'
 
-FROM registry.redhat.io/ubi8/ubi-minimal:latest
+FROM $RUNTIME
 
 ENV OPERATOR=/usr/local/bin/openshift-pipelines-operator-webhook \
     KO_DATA_PATH=/kodata