Skip to content

Commit 83d28b1

Browse files
authored
Terraform update (#23)
* ⬆️ az & tf cli update * 📝 updated supported tag section in readme
1 parent 50447f4 commit 83d28b1

File tree

3 files changed

+16
-21
lines changed

3 files changed

+16
-21
lines changed

README.md

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,22 @@
44

55
# Terraform and Azure CLI Docker image
66

7-
## Availables Docker image tags
7+
## Supported tags and respective Dockerfile links
88
Repository available on Docker Hub: [zenika/terraform-azure-cli](https://hub.docker.com/r/zenika/terraform-azure-cli)
99

10-
[Debian](https://hub.docker.com/_/debian) based images ([debian.Dockerfile](https://github.com/Zenika/terraform-azure-cli/blob/master/debian.Dockerfile)):
11-
12-
* zenika/terraform-azure-cli:latest-debian - build on master branch
13-
* zenika/terraform-azure-cli:X.Y-debian - build on repository tags
14-
15-
[Alpine](https://hub.docker.com/_/alpine) based images ([alpine.Dockerfile](https://github.com/Zenika/terraform-azure-cli/blob/master/alpine.Dockerfile)):
16-
17-
* zenika/terraform-azure-cli:latest - build on master branch (default image tag)
18-
* zenika/terraform-azure-cli:latest-alpine - build on master branch
19-
* zenika/terraform-azure-cli:X.Y-alpine - build on repository tags
20-
21-
> Git repository tag naming convention: `/^([0-9.]+)$/`
10+
* [zenika/terraform-azure-cli:latest](https://github.com/Zenika/terraform-azure-cli/blob/master/alpine.Dockerfile)
11+
* [zenika/terraform-azure-cli:latest-debian](https://github.com/Zenika/terraform-azure-cli/blob/master/debian.Dockerfile)
12+
* [zenika/terraform-azure-cli:2.1-alpine](https://github.com/Zenika/terraform-azure-cli/blob/2.1/alpine.Dockerfile)
13+
* [zenika/terraform-azure-cli:2.1-debian](https://github.com/Zenika/terraform-azure-cli/blob/2.1/debian.Dockerfile)
14+
* [zenika/terraform-azure-cli:2.0-alpine](https://github.com/Zenika/terraform-azure-cli/blob/2.0/alpine.Dockerfile)
15+
* [zenika/terraform-azure-cli:2.0-debian](https://github.com/Zenika/terraform-azure-cli/blob/2.0/debian.Dockerfile)
16+
* [zenika/terraform-azure-cli:1.0](https://github.com/Zenika/terraform-azure-cli/blob/v1.0/Dockerfile) - Debian only
2217

2318
## Motivation
2419
Many Docker images including the Terraform and Azure CLI already exist out there, both on the Docker Hub and Github.
2520
But they all are quite oversized.
2621

27-
The goal is to create a **functional**, **minimalist** and **lightweight** image with these tools in order to reduce network and storage impact.
22+
The goal is to create a **minimalist** and **lightweight** image with these tools in order to reduce network and storage impact.
2823

2924
This image gives you the flexibility to be used for development or as a base image as you see fits.
3025

@@ -54,11 +49,11 @@ docker container run -it --rm -v ${PWD}:/workspace zenika/terraform-azure-cli:la
5449
You can build the image locally directly from the Dockerfiles.
5550

5651
```bash
57-
# Build the Debian based image:
58-
docker image build -f debian.Dockerfile -t zenika/terraform-azure-cli:debian .
59-
6052
# Build the Alpine based image:
6153
docker image build -f alpine.Dockerfile -t zenika/terraform-azure-cli:alpine .
54+
55+
# Build the Debian based image:
56+
docker image build -f debian.Dockerfile -t zenika/terraform-azure-cli:debian .
6257
```
6358

6459
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) :

alpine.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Setup build arguments with default versions
2-
ARG AZURE_CLI_VERSION=2.0.65
3-
ARG TERRAFORM_VERSION=0.11.14
2+
ARG AZURE_CLI_VERSION=2.0.66
3+
ARG TERRAFORM_VERSION=0.12.2
44

55
# Download Terraform binary
66
FROM alpine:3.9.4 as terraform

debian.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Setup build arguments with default versions
2-
ARG AZURE_CLI_VERSION=2.0.65
3-
ARG TERRAFORM_VERSION=0.11.14
2+
ARG AZURE_CLI_VERSION=2.0.66
3+
ARG TERRAFORM_VERSION=0.12.2
44

55
# Download Terraform binary
66
FROM debian:stretch-20190506-slim as terraform

0 commit comments

Comments
 (0)