Skip to content

Commit

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

Bug 1872080: Updating Dockerfile.ocp baseimages to mach ocp-build-data config
  • Loading branch information
openshift-merge-robot authored Aug 25, 2020
2 parents 708f9bb + be696cf commit 4547c8d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.ocp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.14 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
WORKDIR /go/src/github.com/brancz/kube-rbac-proxy
COPY . .
ENV GO111MODULE=on
Expand All @@ -7,7 +7,7 @@ ENV GOFLAGS="-mod=vendor"
RUN make build && \
cp _output/kube-rbac-proxy-$(go env GOOS)-$(go env GOARCH) _output/kube-rbac-proxy

FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
LABEL io.k8s.display-name="kube-rbac-proxy" \
io.k8s.description="This is a proxy, that can perform Kubernetes RBAC authorization." \
io.openshift.tags="kubernetes" \
Expand Down

0 comments on commit 4547c8d

Please sign in to comment.