Skip to content

Commit

Permalink
Merge pull request #29 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 d7f51b1 + e9d46fd commit 4f0342d
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,4 +1,4 @@
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

ADD . /usr/src/sriov-network-device-plugin

Expand All @@ -9,7 +9,7 @@ ENV HTTPS_PROXY $https_proxy
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
ENV INSTALL_PKGS "hwdata"
RUN yum install -y $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
Expand Down

0 comments on commit 4f0342d

Please sign in to comment.