Skip to content

Commit

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

Bug 1872080: Updating Dockerfile baseimages to mach ocp-build-data config
  • Loading branch information
openshift-merge-robot authored Aug 25, 2020
2 parents 6c0ffe8 + eddd5a4 commit c36c19a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 as builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 as builder
WORKDIR /go/src/github.com/openshift/cloud-credential-operator
COPY . .
ENV GO_PACKAGE github.com/openshift/cloud-credential-operator
RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" ./cmd/cloud-credential-operator

FROM registry.svc.ci.openshift.org/ocp/4.5:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
COPY --from=builder /go/src/github.com/openshift/cloud-credential-operator/cloud-credential-operator /usr/bin/
COPY manifests /manifests
# Update perms so we can copy updated CA if needed
Expand Down

0 comments on commit c36c19a

Please sign in to comment.