Skip to content

Commit

Permalink
Merge pull request #120 from openshift-bot/updating-dockerfile.rhel7-…
Browse files Browse the repository at this point in the history
…baseimages-to-mach-ocp-build-data-config

Bug 1872080: Updating Dockerfile.rhel7 baseimages to mach ocp-build-data config
  • Loading branch information
openshift-merge-robot authored Aug 26, 2020
2 parents bde8052 + f16d599 commit 7bad855
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
Original file line number Diff line number Diff line change
@@ -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'
Expand Down

0 comments on commit 7bad855

Please sign in to comment.