diff --git a/Dockerfile b/Dockerfile
index 965462a..2f35a7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,11 +5,14 @@
 
 FROM gliderlabs/alpine:3.2
 RUN apk-install ca-certificates
-RUN mkdir /terraform
-ENV PATH /terraform:$PATH
-WORKDIR /terraform
-ADD https://releases.hashicorp.com/terraform/0.6.6/terraform_0.6.6_linux_amd64.zip terraform.zip
-RUN unzip terraform.zip
-WORKDIR /
+
+ENV TERRAFORM_VERSION 0.6.6
+
+RUN wget -q "https://circle-artifacts.com/gh/andyshinn/alpine-pkg-glibc/6/artifacts/0/home/ubuntu/alpine-pkg-glibc/packages/x86_64/glibc-2.21-r2.apk" && \
+    apk add --allow-untrusted glibc-2.21-r2.apk && \
+    wget -q -O /terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
+    unzip /terraform.zip -d /bin && \
+    rm -rf /var/cache/apk/* glibc-2.21-r2.apk /terraform.zip
+
 ADD drone-terraform /bin/
 ENTRYPOINT ["/bin/drone-terraform"]
diff --git a/main.go b/main.go
index 1804f38..a4ee0d1 100644
--- a/main.go
+++ b/main.go
@@ -48,8 +48,11 @@ func main() {
 
 		err := c.Run()
 		if err != nil {
+			fmt.Println("Error!")
+			fmt.Println(err)
 			os.Exit(1)
 		}
+		fmt.Println("Command completed successfully")
 	}
 
 }