From c98e665f8f41a9cecebad0f8b3820ffbc11e7e96 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:14:40 +0000 Subject: [PATCH 1/2] Updating release/ansible/Dockerfile.rhel8 baseimages to mach ocp-build-data config This PR is autogenerated by the [ocp-build-data-enforcer][1]. It updates the baseimages in the Dockerfile used for promotion in order to ensure it matches the configuration in the [ocp-build-data repository][2] used for producing release artifacts. If you believe the content of this PR is incorrect, please contact the dptp team in #forum-testplatform. [1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer [2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6-rhel-8/images --- release/ansible/Dockerfile.rhel8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/ansible/Dockerfile.rhel8 b/release/ansible/Dockerfile.rhel8 index 36addfd2e..e289c399f 100644 --- a/release/ansible/Dockerfile.rhel8 +++ b/release/ansible/Dockerfile.rhel8 @@ -1,4 +1,4 @@ -FROM openshift/origin-release:golang-1.13 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder ENV GO111MODULE=on \ GOFLAGS=-mod=vendor @@ -7,7 +7,7 @@ COPY . /go/src/github.com/operator-framework/operator-sdk RUN cd /go/src/github.com/operator-framework/operator-sdk \ && make build/ansible-operator VERSION=$(git describe --tags --always) -FROM registry.access.redhat.com/ubi8/ubi +FROM registry.svc.ci.openshift.org/ocp/4.6:base RUN yum install -y \ ansible \ From d40b1fefd26fdfe839205cc974f1722df34a9fc0 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:14:47 +0000 Subject: [PATCH 2/2] Updating release/helm/Dockerfile baseimages to mach ocp-build-data config This PR is autogenerated by the [ocp-build-data-enforcer][1]. It updates the baseimages in the Dockerfile used for promotion in order to ensure it matches the configuration in the [ocp-build-data repository][2] used for producing release artifacts. If you believe the content of this PR is incorrect, please contact the dptp team in #forum-testplatform. [1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer [2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6-rhel-8/images --- release/helm/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/helm/Dockerfile b/release/helm/Dockerfile index 5e17aad44..4962f4032 100644 --- a/release/helm/Dockerfile +++ b/release/helm/Dockerfile @@ -1,4 +1,4 @@ -FROM openshift/origin-release:golang-1.13 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder ENV GO111MODULE=on \ GOFLAGS=-mod=vendor @@ -7,7 +7,7 @@ COPY . /go/src/github.com/operator-framework/operator-sdk RUN cd /go/src/github.com/operator-framework/operator-sdk \ && make build/helm-operator VERSION=$(git describe --tags --always) -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest +FROM registry.svc.ci.openshift.org/ocp/4.6:base ENV OPERATOR=/usr/local/bin/helm-operator \ USER_UID=1001 \