Skip to content

Commit 2a6aae2

Browse files
authored
⬆️ Terraform and Azure CLI version update (#102)
* ⬆️ bump default Terraform and Azure cli version, bump base image tag, bump pip version * ✅ update tests * ⬆️ update supported Terraform and Azure cli version for next release * ⬆️ bumped terraform cli minor version * 📝 updated azure cli release source in readme * ⬆️ bump default version and base debian slim tag * update test for latest default versions * 🔧 prepare next release and add TF 0.14.0-beta1 support * 🔧 ignore changes on readme for latest image tag build and push
1 parent 5923e9d commit 2a6aae2

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed

.github/workflows/push-latest.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
push:
66
branches:
77
- "master"
8+
paths-ignore:
9+
- "!README.md"
810

911
env:
1012
ORGANIZATION: "zenika"

.github/workflows/release.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ jobs:
2727
tf_version:
2828
- "0.11.14"
2929
- "0.12.29"
30-
- "0.13.2"
30+
- "0.13.5"
31+
- "0.14.0-beta1"
3132
azcli_version:
32-
- "2.9.1"
33-
- "2.10.1"
34-
# - "2.11.1" # not ready for release yet: https://github.com/Azure/azure-cli/issues/14963
33+
- "2.11.1"
34+
- "2.12.1"
35+
- "2.13.0"
36+
- "2.14.0"
3537

3638
env:
3739
ORGANIZATION: "zenika"

Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Setup build arguments with default versions
2-
ARG AZURE_CLI_VERSION=2.12.1
3-
ARG TERRAFORM_VERSION=0.13.4
2+
ARG AZURE_CLI_VERSION=2.14.0
3+
ARG TERRAFORM_VERSION=0.13.5
44
ARG PYTHON_MAJOR_VERSION=3.7
5-
ARG DEBIAN_VERSION=buster-20200908-slim
5+
ARG DEBIAN_VERSION=buster-20201012-slim
66

77
# Download Terraform binary
88
FROM debian:${DEBIAN_VERSION} as terraform-cli
@@ -29,7 +29,10 @@ ARG PYTHON_MAJOR_VERSION
2929
RUN apt-get update
3030
RUN apt-get install -y --no-install-recommends python3=${PYTHON_MAJOR_VERSION}.3-1
3131
RUN apt-get install -y --no-install-recommends python3-pip=18.1-5
32-
RUN pip3 install setuptools==49.6.0
32+
RUN apt-get install -y --no-install-recommends gcc=4:8.3.0-1
33+
RUN apt-get install -y --no-install-recommends python3-dev=${PYTHON_MAJOR_VERSION}.3-1
34+
RUN pip3 install setuptools==50.3.2
35+
RUN pip3 install wheel==0.35.1
3336
RUN pip3 install azure-cli==${AZURE_CLI_VERSION}
3437

3538
# Build final image

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ Optionally, it is possible to choose the tools desired versions using [Docker bu
7070

7171
```bash
7272
# Set tools desired versions
73-
AZURE_CLI_VERSION=2.8.0
74-
TERRAFORM_VERSION=0.12.28
73+
AZURE_CLI_VERSION=2.14.0
74+
TERRAFORM_VERSION=0.13.5
7575

7676
# launch the build script with parameters
7777
./dev-build.sh $AZURE_CLI_VERSION $TERRAFORM_VERSION

tests/container-structure-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ commandTests:
2121
- name: "Check Terraform CLI version"
2222
command: "terraform"
2323
args: ["version"]
24-
expectedOutput: ["Terraform v0.13.4"]
24+
expectedOutput: ["Terraform v0.13.5"]
2525

2626
- name: "Check Azure CLI version"
2727
command: "az"
2828
args: ["version"]
29-
expectedOutput: ['"azure-cli": "2.12.1."']
29+
expectedOutput: ['"azure-cli": "2.14.0"']

0 commit comments

Comments
 (0)