Merge "Fix kubectl/oc install in container image"
This commit is contained in:
commit
bc374f5a3e
10
Dockerfile
10
Dockerfile
|
@ -36,12 +36,8 @@ RUN /output/install-from-bindep && zuul-manage-ansible
|
||||||
RUN mkdir /tmp/openshift-install \
|
RUN mkdir /tmp/openshift-install \
|
||||||
&& curl -L $OPENSHIFT_URL -o /tmp/openshift-install/openshift-client.tgz \
|
&& curl -L $OPENSHIFT_URL -o /tmp/openshift-install/openshift-client.tgz \
|
||||||
&& cd /tmp/openshift-install/ \
|
&& cd /tmp/openshift-install/ \
|
||||||
&& echo $OPENSHIFT_SHA openshift-client.tgz | sha256sum --check \
|
&& echo $OPENSHIFT_SHA /tmp/openshift-install/openshift-client.tgz | sha256sum --check \
|
||||||
&& tar xvfz openshift-client.tgz \
|
&& tar xvfz openshift-client.tgz --strip-components=1 -C /tmp/openshift-install
|
||||||
&& cp */kubectl /usr/local/bin \
|
|
||||||
&& cp */oc /usr/local/bin \
|
|
||||||
&& cd / \
|
|
||||||
&& rm -fr /tmp/openshift-install
|
|
||||||
|
|
||||||
FROM opendevorg/python-base as zuul
|
FROM opendevorg/python-base as zuul
|
||||||
|
|
||||||
|
@ -61,6 +57,8 @@ CMD ["/usr/local/bin/zuul"]
|
||||||
|
|
||||||
FROM zuul as zuul-executor
|
FROM zuul as zuul-executor
|
||||||
COPY --from=builder /usr/local/lib/zuul/ /usr/local/lib/zuul
|
COPY --from=builder /usr/local/lib/zuul/ /usr/local/lib/zuul
|
||||||
|
COPY --from=builder /tmp/openshift-install/kubectl /usr/local/bin/kubectl
|
||||||
|
COPY --from=builder /tmp/openshift-install/oc /usr/local/bin/oc
|
||||||
|
|
||||||
CMD ["/usr/local/bin/zuul-executor"]
|
CMD ["/usr/local/bin/zuul-executor"]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue