Skip to content

Commit

Permalink
Merge pull request #135 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.6-ose-service-ca-operator

Updating ose-service-ca-operator builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Feb 1, 2021
2 parents 4f5b8ba + 9195dc3 commit 0a31621
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
@@ -1,10 +1,10 @@
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-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.6:base
FROM registry.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 0a31621

Please sign in to comment.