Add a RHEL7 dockerfile and standarize format #165

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

Merged

openshift-merge-robot merged 1 commit into openshift:master from smarterclayton:rhel7

Nov 14, 2018

Dockerfile.machine-config-controller

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,11 +1,9 @@
  
    FROM golang:1.10.3 AS build-env

    COPY . /go/src/github.com/openshift/machine-config-operator

    FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder

    WORKDIR /go/src/github.com/openshift/machine-config-operator

    COPY . .

    RUN WHAT=machine-config-controller ./hack/build-go.sh

    FROM openshift/origin-base:v4.0.0

    COPY --from=build-env /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-controller /bin/machine-config-controller

    FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base

    COPY --from=builder /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-controller /usr/bin/

    COPY templates /etc/mcc/templates

    ENTRYPOINT ["/bin/machine-config-controller"]

    ENTRYPOINT ["/usr/bin/machine-config-controller"]

Dockerfile.machine-config-controller.rhel7

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
+    WORKDIR /go/src/github.com/openshift/machine-config-operator
+    COPY . .
+    RUN WHAT=machine-config-controller ./hack/build-go.sh
+    FROM registry.svc.ci.openshift.org/ocp/4.0:base
+    COPY --from=builder /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-controller /usr/bin/
+    COPY templates /etc/mcc/templates
+    ENTRYPOINT ["/usr/bin/machine-config-controller"]

Dockerfile.machine-config-daemon

-Original file line number
+Diff line change
@@ -1,10 +1,8 @@
-    FROM golang:1.10.3 AS build-env
-    COPY . /go/src/github.com/openshift/machine-config-operator
+    FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
     WORKDIR /go/src/github.com/openshift/machine-config-operator
+    COPY . .
     RUN WHAT=machine-config-daemon ./hack/build-go.sh
-    FROM openshift/origin-base:v4.0.0
-    COPY --from=build-env /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-daemon /bin/machine-config-daemon
-    ENTRYPOINT ["/bin/machine-config-daemon"]
+    FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
+    COPY --from=builder /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-operator /usr/bin/
+    ENTRYPOINT ["/usr/bin/machine-config-daemon"]

Dockerfile.machine-config-daemon.rhel7

-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+    FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
+    WORKDIR /go/src/github.com/openshift/machine-config-operator
+    COPY . .
+    RUN WHAT=machine-config-daemon ./hack/build-go.sh
+    FROM registry.svc.ci.openshift.org/ocp/4.0:base
+    COPY --from=builder /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-operator /usr/bin/
+    ENTRYPOINT ["/usr/bin/machine-config-daemon"]

Dockerfile.machine-config-operator

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,12 +1,10 @@
  
    FROM golang:1.10.3 AS build-env

    COPY . /go/src/github.com/openshift/machine-config-operator

    FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder

    WORKDIR /go/src/github.com/openshift/machine-config-operator

    COPY . .

    RUN WHAT=machine-config-operator ./hack/build-go.sh

    FROM openshift/origin-base:v4.0.0

    COPY --from=build-env /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-operator /bin/machine-config-operator

    FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base

    COPY --from=builder /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-operator /usr/bin/

    COPY install /manifests

    ENTRYPOINT ["/bin/machine-config-operator"]

    ENTRYPOINT ["/usr/bin/machine-config-operator"]

    LABEL io.openshift.release.operator true

Dockerfile.machine-config-operator.rhel7

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
+    WORKDIR /go/src/github.com/openshift/machine-config-operator
+    COPY . .
+    RUN WHAT=machine-config-operator ./hack/build-go.sh
+    FROM registry.svc.ci.openshift.org/ocp/4.0:base
+    COPY --from=builder /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-operator /usr/bin/
+    COPY install /manifests
+    ENTRYPOINT ["/usr/bin/machine-config-operator"]
+    LABEL io.openshift.release.operator true

Dockerfile.machine-config-server

-Original file line number
+Diff line change
@@ -1,10 +1,8 @@
-    FROM golang:1.10.3 AS build-env
-    COPY . /go/src/github.com/openshift/machine-config-operator
+    FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
     WORKDIR /go/src/github.com/openshift/machine-config-operator
+    COPY . .
     RUN WHAT=machine-config-server ./hack/build-go.sh
-    FROM openshift/origin-base:v4.0.0
-    COPY --from=build-env /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-server /bin/machine-config-server
-    ENTRYPOINT ["/bin/machine-config-server"]
+    FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
+    COPY --from=builder /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-server /usr/bin/
+    ENTRYPOINT ["/usr/bin/machine-config-server"]

Dockerfile.machine-config-server.rhel7

-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+    FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
+    WORKDIR /go/src/github.com/openshift/machine-config-operator
+    COPY . .
+    RUN WHAT=machine-config-server ./hack/build-go.sh
+    FROM registry.svc.ci.openshift.org/ocp/4.0:base
+    COPY --from=builder /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/machine-config-server /usr/bin/
+    ENTRYPOINT ["/usr/bin/machine-config-server"]

Dockerfile.setup-etcd-environment

-Original file line number
+Diff line change
@@ -1,10 +1,8 @@
-    FROM golang:1.10.3 AS build-env
-    COPY . /go/src/github.com/openshift/machine-config-operator
+    FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
     WORKDIR /go/src/github.com/openshift/machine-config-operator
+    COPY . .
     RUN WHAT=setup-etcd-environment ./hack/build-go.sh
-    FROM openshift/origin-base:v4.0.0
-    COPY --from=build-env /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/setup-etcd-environment /bin/setup-etcd-environment
-    ENTRYPOINT ["/bin/setup-etcd-environment"]
+    FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
+    COPY --from=builder /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/setup-etcd-environment /usr/bin/
+    ENTRYPOINT ["/usr/bin/setup-etcd-environment"]

Dockerfile.setup-etcd-environment.rhel7

-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+    FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
+    WORKDIR /go/src/github.com/openshift/machine-config-operator
+    COPY . .
+    RUN WHAT=setup-etcd-environment ./hack/build-go.sh
+    FROM registry.svc.ci.openshift.org/ocp/4.0:base
+    COPY --from=builder /go/src/github.com/openshift/machine-config-operator/_output/linux/amd64/setup-etcd-environment /usr/bin/
+    ENTRYPOINT ["/usr/bin/setup-etcd-environment"]

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a RHEL7 dockerfile and standarize format #165

Uh oh!

Diff view

Diff view

There are no files selected for viewing