From e75dc7f4a031d03d6c5e0cc1a76887a486c9a955 Mon Sep 17 00:00:00 2001
From: SeungYeop Yang <seungyeop.yang@ibm.com>
Date: Wed, 9 Sep 2020 15:11:27 -0500
Subject: [PATCH 1/2] ISSUE-62: tfenv into Dockerfile.ubuntu

---
 Dockerfile.ubuntu | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 5aef6ef..8124c14 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -68,17 +68,27 @@ RUN set -ex && \
     sudo chown ${USER_UID}:${USER_GID} ${HOME}/go
 
 ENV GOROOT=/usr/local/go-1.13
-ENV GOPATH=${HOME}/go
-ENV PATH=$GOROOT/bin:${HOME}/go/bin:$PATH
+#ENV GOPATH=${HOME}/go
+RUN set -ex && \
+    git clone https://github.com/tfutils/tfenv.git ~/.tfenv && \
+    echo 'export GOPATH=${HOME}/go' >> ~/.bashrc && \
+    echo 'export PATH=$HOME/.tfenv/bin:$PATH' >> ~/.bashrc
+ENV PATH=${HOME}/.tfenv/bin:$GOROOT/bin:${HOME}/go/bin:$PATH
 
     # terraform
 RUN set -ex && \
     cd ${HOME} && \
-    wget https://releases.hashicorp.com/terraform/0.12.29/terraform_0.12.29_linux_amd64.zip && \
-    unzip terraform_0.12.29_linux_amd64.zip && \
-    chmod +x terraform && \
-    rm terraform_0.12.29_linux_amd64.zip && \
-    sudo mv terraform /usr/local/bin && \
+    #wget https://releases.hashicorp.com/terraform/0.12.29/terraform_0.12.29_linux_amd64.zip && \
+    #unzip terraform_0.12.29_linux_amd64.zip && \
+    #chmod +x terraform && \
+    #rm terraform_0.12.29_linux_amd64.zip && \
+    #sudo mv terraform /usr/local/bin && \
+    #git clone https://github.com/kamatama41/tfenv.git ~/.tfenv && \
+    #echo 'export GOPATH=$($HOME/go)' >> ~/.bashrc && \
+    #echo 'export PATH=$HOME/.tfenv/bin:$PATH' >> ~/.bashrc && \
+    tfenv install 0.12.29 && \
+    tfenv install 0.13.2 && \
+    tfenv use 0.12.29 && \
     # ibm provider
     wget https://github.com/IBM-Cloud/terraform-provider-ibm/releases/download/v1.11.1/linux_amd64.zip && \
     unzip linux_amd64.zip && \

From 6f590293900e912cb9708074329c383a6cbb9f8f Mon Sep 17 00:00:00 2001
From: SeungYeop Yang <seungyeop.yang@ibm.com>
Date: Wed, 9 Sep 2020 17:44:40 -0500
Subject: [PATCH 2/2] test and debug

---
 Dockerfile.ubuntu | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 8124c14..79d845f 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -65,7 +65,9 @@ RUN set -ex && \
     rm go1.13.9.linux-amd64.tar.gz && \
     sudo mv go /usr/local/go-1.13 && \
     mkdir -p ${HOME}/go && \
-    sudo chown ${USER_UID}:${USER_GID} ${HOME}/go
+    mkdir -p ${HOME}/.terraform.d/plugins && \
+    sudo chown ${USER_UID}:${USER_GID} ${HOME}/go && \
+    sudo chown ${USER_UID}:${USER_GID} ${HOME}/.terraform.d/plugins
 
 ENV GOROOT=/usr/local/go-1.13
 #ENV GOPATH=${HOME}/go
@@ -78,22 +80,14 @@ ENV PATH=${HOME}/.tfenv/bin:$GOROOT/bin:${HOME}/go/bin:$PATH
     # terraform
 RUN set -ex && \
     cd ${HOME} && \
-    #wget https://releases.hashicorp.com/terraform/0.12.29/terraform_0.12.29_linux_amd64.zip && \
-    #unzip terraform_0.12.29_linux_amd64.zip && \
-    #chmod +x terraform && \
-    #rm terraform_0.12.29_linux_amd64.zip && \
-    #sudo mv terraform /usr/local/bin && \
-    #git clone https://github.com/kamatama41/tfenv.git ~/.tfenv && \
-    #echo 'export GOPATH=$($HOME/go)' >> ~/.bashrc && \
-    #echo 'export PATH=$HOME/.tfenv/bin:$PATH' >> ~/.bashrc && \
     tfenv install 0.12.29 && \
     tfenv install 0.13.2 && \
     tfenv use 0.12.29 && \
     # ibm provider
-    wget https://github.com/IBM-Cloud/terraform-provider-ibm/releases/download/v1.11.1/linux_amd64.zip && \
+    wget https://github.com/IBM-Cloud/terraform-provider-ibm/releases/download/v1.11.2/linux_amd64.zip && \
     unzip linux_amd64.zip && \
     chmod +x terraform-provider-ibm_* && \
-    sudo mv terraform-provider-ibm_* /usr/local/bin && \
+    sudo mv terraform-provider-ibm_* ~/.terraform.d/plugins && \
     rm linux_amd64.zip && \
     # packer
     wget https://releases.hashicorp.com/packer/1.6.1/packer_1.6.1_linux_amd64.zip && \