Skip to content

Commit

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

Bug 1872080: Updating Dockerfile.rhel7 baseimages to mach ocp-build-data config
  • Loading branch information
openshift-merge-robot authored Aug 26, 2020
2 parents 487902b + f97e7f2 commit dd0b8f6
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,12 +1,12 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder

ADD . /usr/src/sriov-cni

WORKDIR /usr/src/sriov-cni
RUN make clean && \
make build

FROM registry.svc.ci.openshift.org/ocp/4.0:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
COPY --from=builder /usr/src/sriov-cni/build/sriov /usr/bin/
WORKDIR /

Expand Down

0 comments on commit dd0b8f6

Please sign in to comment.