⬆️ Az cli update (#18)

* ✏️ updated readme: simplified tag doc, added build arg exemple

* ⬆️  updated az cli default version, updated az variable name

Author: bgauduch

README.md

@@ -7,17 +7,15 @@
 ## Availables Docker image tags
 Repository available on Docker Hub: [zenika/terraform-azure-cli](https://hub.docker.com/r/zenika/terraform-azure-cli)
 
-One images uses [Debian](https://hub.docker.com/_/debian) and the other one uses [Alpine](https://hub.docker.com/_/alpine) as a base.
+[Debian](https://hub.docker.com/_/debian) based images ([debian.Dockerfile](https://github.com/Zenika/terraform-azure-cli/blob/master/debian.Dockerfile)):
 
-Debian-based images ([debian.Dockerfile](https://github.com/Zenika/terraform-azure-cli/blob/master/debian.Dockerfile)):
+* zenika/terraform-azure-cli:latest-latest - build on master branch
+* zenika/terraform-azure-cli:X.Y-debian - build on repository tags
 
-* zenika/terraform-azure-cli:latest-latest - latest image build on master branch
-* zenika/terraform-azure-cli:X.Y-debian - versionned image build on repository tags
+[Alpine](https://hub.docker.com/_/alpine) based images ([alpine.Dockerfile](https://github.com/Zenika/terraform-azure-cli/blob/master/alpine.Dockerfile)):
 
-Alpine-based images ([alpine.Dockerfile](https://github.com/Zenika/terraform-azure-cli/blob/master/alpine.Dockerfile)):
-
-* zenika/terraform-azure-cli:alpine-latest - latest image build on master branch
-* zenika/terraform-azure-cli:X.Y-alpine - versionned image build on repository tags
+* zenika/terraform-azure-cli:alpine-latest - build on master branch
+* zenika/terraform-azure-cli:X.Y-alpine - build on repository tags
 
 > Git repository tag naming convention: `/^([0-9.]+)$/`
 
@@ -30,8 +28,8 @@ The goal is to create a **functional**, **minimalist** and **lightweight** image
 ## What's inside ?
 Tools included:
 
-* Azure CLI **v2.0.64**
-* Terraform CLI **v0.11.13**
+* [Azure CLI](https://azure.microsoft.com), see available version on the [pip repository](https://pypi.org/project/azure-cli/)
+* [Terraform CLI](https://www.terraform.io/), see available versions on the [project release page](https://github.com/hashicorp/terraform/releases)
 
 <p align="center">
   <a href="https://azure.microsoft.com"><img width="200" src="resources/azure-logo.png"></a>
@@ -49,16 +47,29 @@ docker container run -it --rm zenika/terraform-azure-cli:alpine-latest
 > The `--rm` flag will completely destroy the container and its data on exit.
 
 ### Build the image
-You can build the image locally directly from the Dockerfiles:
+You can build the image locally directly from the Dockerfiles.
+
 ```bash
-# build the Debian based image:
+# Build the Debian based image:
 docker image build -f debian.Dockerfile -t zenika/terraform-azure-cli:debian .
 
-# build the Alpine based image:
+# Build the Alpine based image:
 docker image build -f alpine.Dockerfile -t zenika/terraform-azure-cli:alpine .
 ```
 
-> You can use [Docker build arguments](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg) to  set custom Terraform & Azure CLI version.
+Optionally, it is possible to choose the tools desired versions using [Docker builds arguments](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg) :
+
+```bash
+# Set tools desired versions
+AZURE_CLI_VERSION=2.0.65
+TERRAFORM_VERSION=0.12.0
+
+# Build the Debian based image:
+docker image build --build-arg AZURE_CLI_VERSION=$AZURE_CLI_VERSION --build-arg TERRAFORM_VERSION=$TERRAFORM_VERSION -f debian.Dockerfile -t zenika/terraform-azure-cli:debian .
+
+# Build the Alpine based image:
+docker image build --build-arg AZURE_CLI_VERSION=$AZURE_CLI_VERSION --build-arg TERRAFORM_VERSION=$TERRAFORM_VERSION -f alpine.Dockerfile -t zenika/terraform-azure-cli:alpine .
+```
 
 ## Roadmap & Contributions
 Please refer to the [github project](https://github.com/Zenika/terraform-azure-cli/projects/1) to track new features.

alpine.Dockerfile

@@ -1,5 +1,6 @@
-ARG TERRAFORM_VERSION=0.11.13
-ARG AZ_CLI_VERSION=2.0.64
+# Setup build arguments with default versions
+ARG AZURE_CLI_VERSION=2.0.65
+ARG TERRAFORM_VERSION=0.11.14
 
 # Download Terraform binary
 FROM alpine:3.9.4 as terraform
@@ -13,7 +14,7 @@ RUN unzip -j terraform-${TERRAFORM_VERSION}.zip
 
 # Install az CLI using PIP
 FROM alpine:3.9.4 as azure-cli
-ARG AZ_CLI_VERSION
+ARG AZURE_CLI_VERSION
 RUN apk update
 RUN apk add python3=3.6.8-r2
 RUN apk add python3-dev=3.6.8-r2
@@ -23,7 +24,7 @@ RUN apk add musl-dev=1.1.20-r4
 RUN apk add libffi-dev=3.2.1-r6
 RUN apk add openssl-dev=1.1.1b-r1
 RUN apk add make=4.2.1-r2
-RUN pip3 install azure-cli==${AZ_CLI_VERSION}
+RUN pip3 install azure-cli==${AZURE_CLI_VERSION}
 
 # Build final image
 FROM alpine:3.9.4

debian.Dockerfile

@@ -1,5 +1,6 @@
-ARG TERRAFORM_VERSION=0.11.13
-ARG AZ_CLI_VERSION=2.0.64
+# Setup build arguments with default versions
+ARG AZURE_CLI_VERSION=2.0.65
+ARG TERRAFORM_VERSION=0.11.14
 
 # Download Terraform binary
 FROM debian:stretch-20190506-slim as terraform
@@ -13,11 +14,11 @@ RUN unzip -j terraform-${TERRAFORM_VERSION}.zip
 
 # Install az CLI using PIP
 FROM debian:stretch-20190506-slim as azure-cli-pip
-ARG AZ_CLI_VERSION
+ARG AZURE_CLI_VERSION
 RUN apt-get update
 RUN apt-get install -y python3=3.5.3-1
 RUN apt-get install -y python3-pip=9.0.1-2+deb9u1
-RUN pip3 install azure-cli==${AZ_CLI_VERSION}
+RUN pip3 install azure-cli==${AZURE_CLI_VERSION}
 # Fix an pyOpenSSL package issue... (see https://github.com/erjosito/ansible-azure-lab/issues/5)
 RUN pip3 uninstall -y pyOpenSSL cryptography
 RUN pip3 install pyOpenSSL==19.0.0