From 162c85b6c329583be645bd729351da1248f83278 Mon Sep 17 00:00:00 2001 From: Su Shi <1684739+metacpp@users.noreply.github.com> Date: Fri, 12 Jan 2018 18:14:06 -0800 Subject: [PATCH] Introduced the version argument to dockerfile. (#43) --- .travis.yml | 2 +- Dockerfile | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8e5bb5..09daf0b 100644 --- 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 index 16981f0..f53cc97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,10 @@ -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="" @@ -8,6 +12,7 @@ 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}