File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 22# It builds an image containing the Mac version of the installer layered on top of the
33# Linux installer image.
44
5- FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
5+ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
66WORKDIR /go/src/github.com/openshift/origin
77COPY . .
88RUN OS_RELEASE_WITHOUT_LINKS=y OS_BUILD_RELEASE_ARCHIVES=n OS_ONLY_BUILD_PLATFORMS="^(darwin|windows)/amd64$" bash -x hack/build-cross.sh
Original file line number Diff line number Diff line change 1- FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
1+ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
22WORKDIR /go/src/github.com/openshift/origin
33COPY . .
44RUN make build WHAT=cmd/oc; \
55 mkdir -p /tmp/build; \
66 cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/oc /tmp/build/oc
77
8- FROM registry.svc.ci.openshift.org/ocp/4.0 :base
8+ FROM registry.svc.ci.openshift.org/ocp/4.1 :base
99COPY --from=builder /tmp/build/oc /usr/bin/
1010RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -s /usr/bin/oc /usr/bin/$i; done
1111LABEL io.k8s.display-name="OpenShift Client" \
Original file line number Diff line number Diff line change 1- FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
1+ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
22WORKDIR /go/src/github.com/openshift/origin
33COPY . .
44RUN make build WHAT=vendor/k8s.io/kubernetes/cmd/hyperkube; \
55 mkdir -p /tmp/build; \
66 cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/hyperkube /tmp/build/hyperkube
77
8- FROM registry.svc.ci.openshift.org/ocp/4.0 :base
8+ FROM registry.svc.ci.openshift.org/ocp/4.1 :base
99COPY --from=builder /tmp/build/hyperkube /usr/bin/
1010LABEL io.k8s.display-name="OpenShift Kubernetes Server Commands" \
1111 io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
Original file line number Diff line number Diff line change 1- FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
1+ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
22WORKDIR /go/src/github.com/openshift/origin
33COPY . .
44RUN make build WHAT=cmd/hypershift; \
55 mkdir -p /tmp/build; \
66 cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/hypershift /tmp/build/hypershift
77
8- FROM registry.svc.ci.openshift.org/ocp/4.0 :base
8+ FROM registry.svc.ci.openshift.org/ocp/4.1 :base
99COPY --from=builder /tmp/build/hypershift /usr/bin/
1010LABEL io.k8s.display-name="OpenShift Server Commands" \
1111 io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
Original file line number Diff line number Diff line change 1- FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
1+ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
22WORKDIR /go/src/github.com/openshift/origin
33COPY . .
44RUN make build WHAT=" \
@@ -13,7 +13,7 @@ RUN mkdir -p /tmp/build; \
1313 cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/loopback /tmp/build/loopback; \
1414 cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/host-local /tmp/build/host-local
1515
16- FROM registry.svc.ci.openshift.org/ocp/4.0 :base
16+ FROM registry.svc.ci.openshift.org/ocp/4.1 :base
1717COPY --from=builder /tmp/build/openshift-sdn /usr/bin/
1818COPY --from=builder /tmp/build/sdn-cni-plugin /opt/cni/bin/openshift-sdn
1919COPY --from=builder /tmp/build/loopback /opt/cni/bin/
Original file line number Diff line number Diff line change 1- FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
1+ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
22WORKDIR /go/src/github.com/openshift/origin
33COPY . .
44RUN make build WHAT=cmd/template-service-broker; \
55 mkdir -p /tmp/build; \
66 cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/template-service-broker /tmp/build/template-service-broker
77
8- FROM registry.svc.ci.openshift.org/ocp/4.0 :base
8+ FROM registry.svc.ci.openshift.org/ocp/4.1 :base
99COPY --from=builder /tmp/build/template-service-broker /usr/bin/
1010LABEL io.k8s.display-name="OpenShift Template Service Broker" \
1111 io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
Original file line number Diff line number Diff line change 1- FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
1+ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
22WORKDIR /go/src/github.com/openshift/origin
33COPY . .
44RUN make build WHAT=cmd/openshift-tests; \
You can’t perform that action at this time.
0 commit comments