Skip to content

Commit

Permalink
Merge pull request #13 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….10-multus-networkpolicy

Updating multus-networkpolicy images to be consistent with ART
  • Loading branch information
dougbtv committed Sep 29, 2021
2 parents fd12fed + febc018 commit bfcc6c8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: golang-1.10
tag: rhel-8-release-golang-1.16-openshift-4.10
4 changes: 2 additions & 2 deletions Dockerfile.openshift
@@ -1,12 +1,12 @@
# This dockerfile is specific to building Multus for OpenShift
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS build
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS build

# Add everything
ADD . /usr/src/multi-networkpolicy-iptables
WORKDIR /usr/src/multi-networkpolicy-iptables
RUN go build ./cmd/multi-networkpolicy-iptables/

FROM registry.ci.openshift.org/ocp/4.9:base
FROM registry.ci.openshift.org/ocp/4.10:base
RUN dnf install -y iptables
COPY --from=build /usr/src/multi-networkpolicy-iptables/multi-networkpolicy-iptables /usr/bin
WORKDIR /usr/bin
Expand Down

0 comments on commit bfcc6c8

Please sign in to comment.