Skip to content

Commit

Permalink
Merge pull request #320 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.6-ose-cluster-kube-scheduler-operator

bug 1916347: Updating ose-cluster-kube-scheduler-operator builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Jan 27, 2021
2 parents 4d9ce87 + 76f7bf6 commit 0b9b05b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
@@ -1,9 +1,9 @@
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/cluster-kube-scheduler-operator
COPY . .
RUN make build --warn-undefined-variables

FROM registry.svc.ci.openshift.org/ocp/4.6:base
FROM registry.ci.openshift.org/ocp/4.6:base
RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests/ /usr/share/bootkube/manifests/config/ /usr/share/bootkube/manifests/manifests/
COPY --from=builder /go/src/github.com/openshift/cluster-kube-scheduler-operator/bindata/bootkube/bootstrap-manifests /usr/share/bootkube/manifests/bootstrap-manifests/
COPY --from=builder /go/src/github.com/openshift/cluster-kube-scheduler-operator/bindata/bootkube/config /usr/share/bootkube/manifests/config/
Expand Down

0 comments on commit 0b9b05b

Please sign in to comment.