Skip to content

Commit

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

Bug 1872080: Updating images/descheduler/Dockerfile.rhel7 baseimages to mach ocp-build-data config
  • Loading branch information
openshift-merge-robot authored Sep 3, 2020
2 parents 61b58b7 + 8ed91f9 commit 5f26c97
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions images/descheduler/Dockerfile.rhel7
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
WORKDIR /go/src/sigs.k8s.io/descheduler
COPY . .
RUN go build -o descheduler ./cmd/descheduler

FROM registry.svc.ci.openshift.org/ocp/4.0:base
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.6
COPY --from=builder /go/src/sigs.k8s.io/descheduler/descheduler /usr/bin/
CMD ["/usr/bin/descheduler"]

0 comments on commit 5f26c97

Please sign in to comment.