From f16d5997e68df2591391790c5a89a220159b45dc Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:28:34 +0000 Subject: [PATCH] Updating Dockerfile.rhel7 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 --- Dockerfile.rhel7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index f3469f151..7fd8a157b 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,10 +1,10 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder WORKDIR /go/src/github.com/openshift/service-ca-operator COPY . . ENV GO_PACKAGE github.com/openshift/service-ca-operator RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" ./cmd/service-ca-operator -FROM registry.svc.ci.openshift.org/ocp/4.4:base +FROM registry.svc.ci.openshift.org/ocp/4.6:base COPY --from=builder /go/src/github.com/openshift/service-ca-operator/service-ca-operator /usr/bin/ COPY manifests /manifests # Using the vendored CRD ensures compatibility with 'oc explain'