UPSTREAM: <carry>: Update Dockerfile images to match ART

(cherry picked from commit 54928f56653267efd65b06b97931d8c308e6d0fbi, 6514e96 and b3434c6) (cherry picked from commit 86c0cdd) (cherry picked from commit 2581b97) (cherry picked from commit e92d839) (cherry picked from commit efa227e) (cherry picked from commit bc9e34a) (cherry picked from commit da65e51) (cherry picked from commit bae3720) (cherry picked from commit b498600) Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> (cherry picked from commit ec425bd) Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> (cherry picked from commit 3f79a35) Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> (cherry picked from commit 09598bd) Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> (cherry picked from commit 2a427cb) Signed-off-by: Mat Kowalski <mko@redhat.com>
openshift-networking · Jun 21, 2023 · 1ed4511 · 1ed4511
1 parent 8090689
commit 1ed4511
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.20-openshift-4.14
+  tag: rhel-8-release-golang-1.16-openshift-4.10
diff --git a/build/Dockerfile.openshift b/build/Dockerfile.openshift
@@ -1,9 +1,9 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.15 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder
 WORKDIR /go/src/github.com/openshift/kubernetes-nmstate
 COPY . .
 RUN GO111MODULE=on go build --mod=vendor -o build/_output/bin/manager ./cmd/handler/
 
-FROM ubi8-minimal
+FROM registry.ci.openshift.org/ocp/4.10:base
 
 RUN \
     microdnf -y update && \

diff --git a/build/Dockerfile.operator.openshift b/build/Dockerfile.operator.openshift
@@ -1,9 +1,9 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.15 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS builder
 WORKDIR /go/src/github.com/openshift/kubernetes-nmstate
 COPY . .
 RUN GO111MODULE=on go build --mod=vendor -o build/_output/bin/manager ./cmd/operator
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal
+FROM registry.ci.openshift.org/ocp/4.9:base
 
 COPY --from=builder /go/src/github.com/openshift/kubernetes-nmstate/build/_output/bin/manager /usr/bin/
 COPY deploy/crds/nmstate.io_nodenetwork*.yaml /bindata/kubernetes-nmstate/crds/