Skip to content

Commit

Permalink
Updating images/router/base/Dockerfile.rhel baseimages to mach ocp-bu…
Browse files Browse the repository at this point in the history
…ild-data config

This PR is autogenerated by the [ocp-build-data-enforcer][1].
It updates the baseimages in the Dockerfile used for promotion in order to ensure it
matches the configuration in the [ocp-build-data repository][2] used
for producing release artifacts.

If you believe the content of this PR is incorrect, please contact the dptp team in
#forum-testplatform.

[1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer
[2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6-rhel-8/images
  • Loading branch information
openshift-bot committed Aug 24, 2020
1 parent 4a6284e commit 0a9eb0c
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 0a9eb0c

Please sign in to comment.