mv ibmcloud to /bin folder

openshift · Nov 25, 2022 · 14748c0 · 14748c0
1 parent f04db08
commit 14748c0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci
@@ -57,11 +57,15 @@ RUN curl -sSL "${ALIYUN_URI}" --output /tmp/aliyun-cli-linux-latest-amd64.tgz &&
 
 # Download the latest IBM Cloud release binary
 ARG IBMCLI_URI=https://clis.cloud.ibm.com/install/linux
-RUN curl -fsSL ${IBMCLI_URI} | sh && \
+RUN mkdir /output && HOME=/output && \ 
+    curl -fsSL ${IBMCLI_URI} | sh && \
     ibmcloud plugin install vpc-infrastructure -f && \
     ibmcloud plugin install cloud-dns-services -f && \
     ibmcloud plugin install cloud-internet-services -f && \
-    chmod -R g=u "$HOME/.bluemix/"
+    cp /usr/local/bin/ibmcloud /bin/ibmcloud && \
+    chmod -R g=u "$HOME/.bluemix/" && \
+    ibmcloud version && \
+    ibmcloud plugin list
 
 RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py
 RUN python get-pip.py 'pip<21.0'
@@ -86,7 +90,7 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2
     ./aws/install -b /bin && \
     rm -rf ./aws awscliv2.zip
 
-RUN mkdir /output && chown 1000:1000 /output
+RUN chown 1000:1000 /output
 USER 1000:1000
 ENV PATH /bin
 ENV HOME /output

diff --git a/images/installer/Dockerfile.upi.ci.rhel8 b/images/installer/Dockerfile.upi.ci.rhel8
@@ -53,11 +53,15 @@ RUN curl -sSL "${ALIYUN_URI}" --output /tmp/aliyun-cli-linux-latest-amd64.tgz &&
 
 # Download the latest IBM Cloud release binary
 ARG IBMCLI_URI=https://clis.cloud.ibm.com/install/linux
-RUN curl -fsSL ${IBMCLI_URI} | sh && \
+RUN mkdir /output && HOME=/output && \ 
+    curl -fsSL ${IBMCLI_URI} | sh && \
     ibmcloud plugin install vpc-infrastructure -f && \
     ibmcloud plugin install cloud-dns-services -f && \
     ibmcloud plugin install cloud-internet-services -f && \
-    chmod -R g=u "$HOME/.bluemix/"
+    cp /usr/local/bin/ibmcloud /bin/ibmcloud && \
+    chmod -R g=u "$HOME/.bluemix/" && \
+    ibmcloud version && \
+    ibmcloud plugin list
 
 # Not packaged, but required by gcloud. See https://cloud.google.com/sdk/crypto
 RUN pip-3 install cryptography
@@ -82,7 +86,7 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2
     ./aws/install -b /bin && \
     rm -rf ./aws awscliv2.zip
 
-RUN mkdir /output && chown 1000:1000 /output
+RUN chown 1000:1000 /output
 USER 1000:1000
 ENV PATH /bin
 ENV HOME /output