From e7e6e135849828afb65af9a7f49f71fb8bebd7a4 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 29 Jan 2022 22:29:13 +0000 Subject: [PATCH] Updating ose-image-customization-controller images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/0059e470a61eba28225165168b22d9e77c33c926/images/ose-image-customization-controller.yml --- .ci-operator.yaml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 00d7adfc..46d8010b 100644 --- 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.17-openshift-4.10 + tag: rhel-8-release-golang-1.17-openshift-4.11 diff --git a/Dockerfile b/Dockerfile index 07c932a7..5e98ae6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 AS builder WORKDIR /go/src/github.com/openshift/image-customization-controller COPY . . RUN CGO_ENABLED=0 GO111MODULE=on go build -mod=vendor -a -o bin/image-customization-controller cmd/controller/main.go RUN CGO_ENABLED=0 GO111MODULE=on go build -mod=vendor -a -o bin/image-customization-server cmd/static-server/main.go -FROM registry.ci.openshift.org/ocp/4.10:base +FROM registry.ci.openshift.org/ocp/4.11:base COPY --from=builder /go/src/github.com/openshift/image-customization-controller/bin/image-customization-controller / COPY --from=builder /go/src/github.com/openshift/image-customization-controller/bin/image-customization-server / RUN dnf install -y nmstate