Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a RHEL7 Dockerfile and standardize format #3

Merged
merged 2 commits into from
Nov 13, 2018

Conversation

ironcladlou
Copy link

1. Why is this pull request needed and what does it do?

2. Which issues (if any) are related?

3. Which documentation changes (if any) need to be made?

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 13, 2018
Dockerfile.rhel Outdated
@@ -1,11 +1,10 @@
FROM openshift/origin-release:golang-1.10 as build
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please look exactly like this commit (
openshift/csi-external-attacher#6). You want two docker files, one with .rhel as an extension.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 13, 2018
FROM centos:7
COPY --from=build /go/src/github.com/coredns/coredns/coredns /usr/bin/coredns
FROM registry.svc.ci.openshift.org/ocp/4.0:base
COPY --from=builder /go/src/github.com/coredns/coredns/coredns /usr/bin/coredns

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can omit the trailing /coredns and just have /usr/bin/ as the destination.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(do that in both docker files

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -0,0 +1,13 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can do Dockerfile and Dockerfile.rhel, unless there is a docker file in the repo already that you don't want to overwrite.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's already a Dockerfile

@ironcladlou
Copy link
Author


ENTRYPOINT ["/usr/bin/coredns"]

LABEL io.k8s.display-name="CoreDNS" \

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep the two docker files identical except for the FROM lines.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's already the case...

@ironcladlou
Copy link
Author

/retest

@ironcladlou
Copy link
Author

Test terraform failure looks suspiciously flaky...

/retest

@smarterclayton
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 13, 2018
@openshift-merge-robot openshift-merge-robot merged commit 4fbb9ba into openshift:master Nov 13, 2018
@ironcladlou ironcladlou deleted the dockerfile-rhel branch January 30, 2019 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants