Introduced the version argument to dockerfile. (#43)

Azure · Jan 13, 2018 · 162c85b · 162c85b
1 parent 22b4e7d
commit 162c85b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,5 +20,5 @@ jobs:
     - stage: rake build
       install: true
       script:
-      - docker build -t ${IMAGE_NAME} .
+      - docker build --build-arg BUILD_TERRAFORM_VERSION=${TERRAFORM_VERSION} -t ${IMAGE_NAME} .
       - docker run ${IMAGE_NAME} rake build
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,18 @@
-FROM microsoft/terraform-test:0.11.1
+# Pull the base image with given version.
+ARG BUILD_TERRAFORM_VERSION="0.11.1"
+FROM microsoft/terraform-test:${BUILD_TERRAFORM_VERSION}
 
 ARG MODULE_NAME="terraform-azurerm-compute"
+
+# Declare default build configurations for terraform.
 ARG BUILD_ARM_SUBSCRIPTION_ID=""
 ARG BUILD_ARM_CLIENT_ID=""
 ARG BUILD_ARM_CLIENT_SECRET=""
 ARG BUILD_ARM_TENANT_ID=""
 ARG BUILD_ARM_TEST_LOCATION="WestEurope"
 ARG BUILD_ARM_TEST_LOCATION_ALT="WestUS"
 
+# Set environment variables for terraform runtime.
 ENV ARM_SUBSCRIPTION_ID=${BUILD_ARM_SUBSCRIPTION_ID}
 ENV ARM_CLIENT_ID=${BUILD_ARM_CLIENT_ID}
 ENV ARM_CLIENT_SECRET=${BUILD_ARM_CLIENT_SECRET}