-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from ericavonb/build-release
chore(Dockerfile*): standardize dockerfiles + add rhel7
- Loading branch information
Showing
2 changed files
with
27 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,17 @@ | ||
| FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder | ||
| COPY . /go/src/github.com/openshift/cluster-machine-appover | ||
| RUN cd /go/src/github.com/openshift/cluster-machine-appover && go build -o machine-approver . | ||
| WORKDIR /go/src/github.com/openshift/cluster-machine-appover | ||
| COPY . . | ||
| RUN make build | ||
|
|
||
| FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base | ||
| COPY --from=builder /go/src/github.com/openshift/cluster-machine-appover/machine-approver /usr/bin/machine-approver | ||
| COPY --from=builder /go/src/github.com/openshift/cluster-machine-appover/machine-approver /usr/bin/ | ||
| COPY manifests /manifests | ||
| LABEL io.openshift.release.operator true | ||
| ENTRYPOINT ["/usr/bin/machine-approver"] | ||
| LABEL io.k8s.display-name="OpenShift cluster-machine-approver" \ | ||
| io.k8s.description="This is an OpenShift component for managing machine approval" \ | ||
| com.redhat.component="cluster-machine-approver" \ | ||
| maintainer="OpenShift Auth Team <[email protected]>" \ | ||
| name="openshift/ose-cluster-machine-approver" \ | ||
| version="v4.0.0" \ | ||
| io.openshift.tags="openshift" \ | ||
| io.openshift.release.operator=true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,17 @@ | ||
| FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder | ||
| COPY . /go/src/github.com/openshift/cluster-machine-appover | ||
| RUN cd /go/src/github.com/openshift/cluster-machine-appover && go build -o machine-approver . | ||
| WORKDIR /go/src/github.com/openshift/cluster-machine-appover | ||
| COPY . . | ||
| RUN make build | ||
|
|
||
| FROM registry.svc.ci.openshift.org/ocp/origin-v4.0:base | ||
| COPY --from=builder /go/src/github.com/openshift/cluster-machine-appover/machine-approver /usr/bin/machine-approver | ||
| FROM registry.svc.ci.openshift.org/ocp/4.0:base | ||
| COPY --from=builder /go/src/github.com/openshift/cluster-machine-appover/machine-approver /usr/bin/ | ||
| COPY manifests /manifests | ||
| LABEL io.openshift.release.operator=true | ||
| ENTRYPOINT ["/usr/bin/machine-approver"] | ||
| LABEL io.k8s.display-name="OpenShift cluster-machine-approver" \ | ||
| io.k8s.description="This is an OpenShift component for approving new machines" \ | ||
| com.redhat.component="cluster-machine-approver" \ | ||
| maintainer="OpenShift Auth Team <[email protected]>" \ | ||
| name="openshift/ose-cluster-machine-approver" \ | ||
| version="v4.0.0" \ | ||
| io.openshift.tags="openshift" \ | ||
| io.openshift.release.operator=true |