Skip to content

Commit

Permalink
Merge pull request #173 from openshift-bot/updating-images/router/bas…
Browse files Browse the repository at this point in the history
…e/dockerfile.rhel-baseimages-to-mach-ocp-build-data-config

Bug 1872080: Updating images/router/base/Dockerfile.rhel baseimages to mach ocp-build-data config
  • Loading branch information
openshift-merge-robot authored Sep 3, 2020
2 parents 44b9185 + 0a9eb0c commit 189ceba
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions images/router/base/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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
WORKDIR /go/src/github.com/openshift/router
COPY . .
RUN make

FROM registry.svc.ci.openshift.org/ocp/4.0:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
COPY --from=builder /go/src/github.com/openshift/router/openshift-router /usr/bin/
LABEL io.k8s.display-name="OpenShift Router" \
io.k8s.description="This is the base image from which all template based routers inherit." \
Expand Down

0 comments on commit 189ceba

Please sign in to comment.