Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #31 from openshift-bot/art-consistency-openshift-4…
….6-ose-multus-admission-controller

Updating ose-multus-admission-controller builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Jan 16, 2021
2 parents a7312f5 + 8657ca0 commit de9b6e1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.openshift
@@ -1,5 +1,5 @@
# This dockerfile is specific to building Multus admission controller for OpenShift
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

# Add everything
ENV PKG_NAME=github.com/k8snetworkplumbingwg/net-attach-def-admission-controller
Expand All @@ -14,7 +14,7 @@ RUN ./build.sh

WORKDIR /

FROM registry.svc.ci.openshift.org/ocp/4.6:base
FROM registry.ci.openshift.org/ocp/4.6:base
COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/net-attach-def-admission-controller/bin/webhook /usr/bin/

LABEL io.k8s.display-name="Container Networking Plugins" \
Expand Down

0 comments on commit de9b6e1

Please sign in to comment.