From a36030ad503005861125becaf039213449f0e85c Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 15 May 2023 09:49:01 +0000 Subject: [PATCH] Updating ingress-node-firewall-daemon images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b19b910c2c26178e10f256213883e7ea6a4c890a/images/ingress-node-firewall-daemon.yml --- .ci-operator.yaml | 2 +- Dockerfile.daemon.openshift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 9a3f7b8fb..810de9f0e 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.19-openshift-4.14 + tag: rhel-9-release-golang-1.20-openshift-4.14 diff --git a/Dockerfile.daemon.openshift b/Dockerfile.daemon.openshift index 75362ae5f..9ded1b6d3 100644 --- a/Dockerfile.daemon.openshift +++ b/Dockerfile.daemon.openshift @@ -1,10 +1,10 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.14 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 AS builder WORKDIR /go/src/github.com/openshift/ingress-node-firewall COPY . . RUN ./hack/build-daemon.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.14 +FROM registry.ci.openshift.org/ocp/4.14:base-rhel9 COPY --from=builder /go/src/github.com/openshift/ingress-node-firewall/bin/daemon /usr/bin/ COPY --from=builder /go/src/github.com/openshift/ingress-node-firewall/bin/syslog /usr/bin/ CMD ["/usr/bin/daemon"]