File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -111,11 +111,16 @@ RUN cat ./image-message >> ./.bashrc-ni
111111
112112RUN curl -L https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz --output oc-client.tar.gz && \
113113 tar xzf oc-client.tar.gz && \
114- sudo cp openshift-origin-client-tools*/oc /usr/local/bin && \
115- sudo chmod +x /usr/local/bin/oc && \
114+ sudo mkdir -p /usr/local/fix && \
115+ sudo chmod a+rwx /usr/local/fix && \
116+ sudo cp openshift-origin-client-tools*/oc /usr/local/fix && \
117+ sudo chmod +x /usr/local/fix/oc && \
116118 rm -rf openshift-origin-client-tools* && \
117119 rm oc-client.tar.gz && \
118- echo "alias oc='/lib/ld-musl-x86_64.so.1 --library-path /lib /usr/local/bin/oc'" >> ./.bashrc-ni
120+ echo '/lib/ld-musl-x86_64.so.1 --library-path /lib /usr/local/fix/oc $@' > ./oc && \
121+ sudo mv ./oc /usr/local/bin && \
122+ sudo chmod +x /usr/local/bin/oc
123+ # echo "alias oc='/lib/ld-musl-x86_64.so.1 --library-path /lib /usr/local/bin/oc'" >> ./.bashrc-ni
119124
120125
121126RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
Original file line number Diff line number Diff line change @@ -49,10 +49,10 @@ commandTests:
4949 args : ["--help"]
5050 expectedOutput : ["usage: git.*"]
5151
52- # - name: "OpenShift client installation"
53- # command: "/lib/ld-musl-x86_64.so.1 --library-path /lib /usr/local/bin/ oc"
54- # args: ["--help"]
55- # expectedOutput: [".*OpenShift.*"]
52+ - name : " OpenShift client installation"
53+ command : " oc"
54+ args : ["--help"]
55+ expectedOutput : [".*OpenShift.*"]
5656
5757fileExistenceTests :
5858 - name : ' jenkins-config-template.xml'
Original file line number Diff line number Diff line change 11{
22 "name" : " cli-tools" ,
3- "version" : " 0.1.9 " ,
3+ "version" : " 0.1.10 " ,
44 "org" : " ibmgaragecloud" ,
55 "branch" : " lite" ,
66 "description" : " This repository contains a docker image to help setup an IBM Cloud Public development environment." ,
You can’t perform that action at this time.
0 commit comments