Skip to content

Commit

Permalink
Merge pull request #497 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.6-openshift-enterprise-console-operator

Updating openshift-enterprise-console-operator builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Jan 16, 2021
2 parents b195ceb + 1136b86 commit 7fd78a2
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: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/console-operator
COPY . .
ENV GO_PACKAGE github.com/openshift/console-operator
RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" -tags="ocp" -o console ./cmd/console

FROM registry.svc.ci.openshift.org/ocp/4.6:base
FROM registry.ci.openshift.org/ocp/4.6:base
RUN useradd console-operator
USER console-operator
COPY --from=builder /go/src/github.com/openshift/console-operator/console /usr/bin/console
Expand Down

0 comments on commit 7fd78a2

Please sign in to comment.