Skip to content

Commit

Permalink
Merge pull request #535 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.14-marketplace-operator

OCPBUGS-19075: Updating marketplace-operator images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Sep 20, 2023
2 parents 15c081d + c548f47 commit 41f3c8f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,10 +1,10 @@

FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.12 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder
WORKDIR /go/src/github.com/operator-framework/operator-marketplace
COPY . .
RUN make osbs-build

FROM registry.ci.openshift.org/openshift/origin-v4.0:base
FROM registry.ci.openshift.org/ocp/4.14:base
RUN useradd marketplace-operator
USER marketplace-operator
COPY --from=builder /go/src/github.com/operator-framework/operator-marketplace/build/_output/bin/marketplace-operator /usr/bin
Expand Down

0 comments on commit 41f3c8f

Please sign in to comment.