Skip to content

Commit 51ba245

Browse files
author
Sean Sundberg
committed
Bumps ibm cloud terraform provider to v1.7.0
1 parent bca1f6d commit 51ba245

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

Dockerfile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM docker.io/hashicorp/terraform:0.12.26
22

3-
ENV TERRAFORM_IBMCLOUD_VERSION 1.6.0
3+
ENV TERRAFORM_IBMCLOUD_VERSION 1.7.0
44
ENV KUBECTL_VERSION 1.15.5
55

66
RUN apk add --update-cache \
@@ -42,10 +42,10 @@ COPY --chown=devops:root src/etc/* ${HOME}/etc/
4242
##################################
4343

4444
# Install the ibmcloud cli
45-
#RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \
46-
# ibmcloud plugin install container-service && \
47-
# ibmcloud plugin install container-registry && \
48-
# ibmcloud config --check-version=false
45+
RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \
46+
ibmcloud plugin install container-service && \
47+
ibmcloud plugin install container-registry && \
48+
ibmcloud config --check-version=false
4949

5050
# Install IBM Cloud Terraform Provider
5151
RUN mkdir -p ${HOME}/.terraform.d/plugins && \
@@ -61,17 +61,17 @@ WORKDIR ${HOME}
6161
COPY --chown=devops:root src/image-message ./image-message
6262
RUN cat ./image-message >> ./.bashrc-ni
6363

64-
#RUN 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 && \
65-
# tar xzf oc-client.tar.gz && \
66-
# sudo mkdir -p /usr/local/fix && \
67-
# sudo chmod a+rwx /usr/local/fix && \
68-
# sudo cp openshift-origin-client-tools*/oc /usr/local/fix && \
69-
# sudo chmod +x /usr/local/fix/oc && \
70-
# rm -rf openshift-origin-client-tools* && \
71-
# rm oc-client.tar.gz && \
72-
# echo '/lib/ld-musl-x86_64.so.1 --library-path /lib /usr/local/fix/oc $@' > ./oc && \
73-
# sudo mv ./oc /usr/local/bin && \
74-
# sudo chmod +x /usr/local/bin/oc
64+
RUN 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 && \
65+
tar xzf oc-client.tar.gz && \
66+
sudo mkdir -p /usr/local/fix && \
67+
sudo chmod a+rwx /usr/local/fix && \
68+
sudo cp openshift-origin-client-tools*/oc /usr/local/fix && \
69+
sudo chmod +x /usr/local/fix/oc && \
70+
rm -rf openshift-origin-client-tools* && \
71+
rm oc-client.tar.gz && \
72+
echo '/lib/ld-musl-x86_64.so.1 --library-path /lib /usr/local/fix/oc $@' > ./oc && \
73+
sudo mv ./oc /usr/local/bin && \
74+
sudo chmod +x /usr/local/bin/oc
7575

7676
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
7777
chmod +x ./kubectl && \

0 commit comments

Comments
 (0)