mirror of
https://github.com/openshift/installer.git
synced 2026-02-05 15:47:14 +01:00
Merge pull request #903 from abhinavdahiya/dockerfile
image: Add a RHEL7 dockerfile and standarize format
This commit is contained in:
@@ -1,15 +1,14 @@
|
||||
# This Dockerfile is a used by CI to publish openshift/origin-v4.0:installer
|
||||
# It builds an image containing only the openshift-install and terraform binaries.
|
||||
# It builds an image containing only the openshift-install.
|
||||
|
||||
FROM openshift/origin-release:golang-1.10 AS build
|
||||
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
|
||||
WORKDIR /go/src/github.com/openshift/installer
|
||||
COPY . .
|
||||
RUN hack/build.sh
|
||||
|
||||
|
||||
FROM centos:7
|
||||
COPY --from=build /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
|
||||
COPY --from=build /go/src/github.com/openshift/installer/bin/terraform /bin/terraform
|
||||
FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
|
||||
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
|
||||
RUN mkdir /output && chown 1000:1000 /output
|
||||
USER 1000:1000
|
||||
ENV PATH /bin
|
||||
|
||||
17
images/installer/Dockerfile.ci.rhel7
Normal file
17
images/installer/Dockerfile.ci.rhel7
Normal file
@@ -0,0 +1,17 @@
|
||||
# This Dockerfile is a used by CI to publish openshift/origin-v4.0:installer
|
||||
# It builds an image containing only the openshift-install.
|
||||
|
||||
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
|
||||
WORKDIR /go/src/github.com/openshift/installer
|
||||
COPY . .
|
||||
RUN hack/build.sh
|
||||
|
||||
|
||||
FROM registry.svc.ci.openshift.org/ocp/4.0:base
|
||||
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
|
||||
RUN mkdir /output && chown 1000:1000 /output
|
||||
USER 1000:1000
|
||||
ENV PATH /bin
|
||||
ENV HOME /output
|
||||
WORKDIR /output
|
||||
ENTRYPOINT ["/bin/openshift-install"]
|
||||
@@ -7,7 +7,6 @@ RUN hack/build.sh
|
||||
|
||||
FROM centos:7
|
||||
COPY --from=build /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
|
||||
COPY --from=build /go/src/github.com/openshift/installer/bin/terraform /bin/terraform
|
||||
COPY --from=build /go/src/github.com/openshift/installer/images/nested-libvirt/google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo
|
||||
COPY --from=build /go/src/github.com/openshift/installer/images/nested-libvirt/mock-nss.sh /bin/mock-nss.sh
|
||||
|
||||
|
||||
Reference in New Issue
Block a user