🔧 update Terraform 1.12 to minor 28, prepare beta-3 release, rework release workflow (#81)

* 🔧 updated Terraform 1.12 to minor 28, rework release workflow

* 🐛 moved broken image release tag construction out of env vars

* ⬆️ update default terraform version

* 🐛 correct image build step, add missing dash in image tag

* 📝 update readme with new tag strategy, correct image release tag

* ⬆️ prepare terraform 0.13.0-beta3 release

Author: bgauduch

.github/workflows/release.yml

@@ -5,10 +5,6 @@ on:
   release:
     types: [published]
 
-env:
-  ORGANIZATION: "zenika"
-  IMAGE_NAME: "terraform-azure-cli"
-
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -28,15 +24,15 @@ jobs:
 
     strategy:
       matrix:
-        versions:
-          - { tf_version: "0.11.14", azcli_version: "2.8.0" }
-          - { tf_version: "0.12.26", azcli_version: "2.8.0" }
-          - { tf_version: "0.13.0-beta2", azcli_version: "2.8.0" }
+        tf_version:
+          - "0.11.14"
+          - "0.12.28"
+          - "0.13.0-beta3"
 
     env:
-      TF_VERSION: ${{ matrix.versions.tf_version }}
-      AWS_CLI_VERSIOIN: ${{ matrix.versions.azcli_version }}
-      IMAGE_TAG: "tf${{ matrix.versions.tf_version }}-azcli${{ matrix.versions.azcli_version }}"
+      ORGANIZATION: "zenika"
+      IMAGE_NAME: "terraform-azure-cli"
+      AZURE_CLI_VERSION: "2.8.0"
 
     steps:
       - name: Check out the repo
@@ -46,19 +42,19 @@ jobs:
         run: echo "::set-env name=RELEASE_TAG::${GITHUB_REF##*/}"
 
       - name: Build and save image release tag
-        run: echo "::set-env name=IMAGE_RELEASE_TAG::r${RELEASE_TAG}-${IMAGE_TAG}"
+        run: echo "::set-env name=IMAGE_RELEASE_TAG::release-${RELEASE_TAG}_terraform-${{ matrix.tf_version }}_azcli-${{ env.AZURE_CLI_VERSION }}"
 
       - name: Build image
-        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=$TF_VERSION --build-arg AWS_CLI_VERSION=$AWS_CLI_VERSIOIN --tag $ORGANIZATION/$IMAGE_NAME:$IMAGE_RELEASE_TAG
+        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AZURE_CLI_VERSION=${AZURE_CLI_VERSION} --tag ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Login to Docker Hub registry
         run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
       - name: Push image to registry
-        run: docker push $ORGANIZATION/$IMAGE_NAME:$IMAGE_RELEASE_TAG
+        run: docker push ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Save image
-        run: docker image save -o $IMAGE_NAME-$IMAGE_RELEASE_TAG.tar $ORGANIZATION/$IMAGE_NAME:$IMAGE_RELEASE_TAG
+        run: docker image save -o ${IMAGE_NAME}-${IMAGE_RELEASE_TAG}.tar ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Upload image artifact
         uses: actions/upload-artifact@v2

Dockerfile

@@ -1,6 +1,6 @@
 # Setup build arguments with default versions
 ARG AZURE_CLI_VERSION=2.8.0
-ARG TERRAFORM_VERSION=0.12.26
+ARG TERRAFORM_VERSION=0.12.28
 ARG PYTHON_MAJOR_VERSION=3.7
 ARG DEBIAN_VERSION=buster-20200514-slim
 

README.md

@@ -18,10 +18,10 @@ Available image tags can be found on the Docker Hub registry: [zenika/terraform-
 The following image tag strategy is applied:
 * `zenika/terraform-azure-cli:latest` - build from master
   * Included CLI versions can be found in the [Dockerfile](https://github.com/Zenika/terraform-azure-cli/blob/master/Dockerfile)
-* `zenika/terraform-azure-cli:rS.T-tfUU.VV.WW-azcliXX.YY.ZZ` - build from releases
-  * `rS.T` is the release tag
-  * `tfUU.VV.WWW` is the included Terraform CLI version
-  * `azcliXX.YY.ZZ` is the included Azure CLI version
+* `zenika/terraform-azure-cli:release-S.T_terraform-UU.VV.WW_azcli-XX.YY.ZZ` - build from releases
+  * `release-S.T` is the release tag
+  * `terraform-UU.VV.WWW` is the included Terraform CLI version
+  * `azcli-XX.YY.ZZ` is the included Azure CLI version
 
 Please report to the [releases page](https://github.com/Zenika/terraform-azure-cli/releases) for the changelogs. Any other tags are not supported.
 
@@ -71,7 +71,7 @@ Optionally, it is possible to choose the tools desired versions using [Docker bu
 ```bash
 # Set tools desired versions
 AZURE_CLI_VERSION=2.8.0
-TERRAFORM_VERSION=0.12.26
+TERRAFORM_VERSION=0.12.28
 
 # launch the build script with parameters
 ./dev-build.sh $AZURE_CLI_VERSION $TERRAFORM_VERSION

tests/container-structure-tests.yml

@@ -21,7 +21,7 @@ commandTests:
   - name: "Check Terraform CLI version"
     command: "terraform"
     args: ["version"]
-    expectedOutput: ["Terraform v0.12.26"]
+    expectedOutput: ["Terraform v0.12.28"]
 
   - name:  "Check Azure CLI version"
     command: "az"