Skip to content

Commit 17c168d

Browse files
authored
⬆️ Terraform and AWS CLI Version update (#44)
* ⬆️ udpate TF, AWS CLI and setuptools version as well as base image tag * ✅ update test for latest default version * 🔧 prepare next release * 🔧 ignore changes on readme and code of conduct for build on master and latest push
1 parent 3148cf4 commit 17c168d

File tree

6 files changed

+17
-13
lines changed

6 files changed

+17
-13
lines changed

.github/workflows/lint-build-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- "!master"
1212
paths-ignore:
1313
- "!README.md"
14+
- "!CODE_OF_CONDUCT.md.md"
1415

1516
env:
1617
ORGANIZATION: "zenika"

.github/workflows/push-latest.yml

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

912
env:
1013
ORGANIZATION: "zenika"

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
tf_version:
2828
- "0.11.14"
2929
- "0.12.29"
30-
- "0.13.1"
30+
- "0.13.5"
31+
- "0.14.0-beta1"
3132
awscli_version:
32-
- "1.16.314"
33-
- "1.17.17"
34-
- "1.18.127"
33+
- "1.18.160"
34+
- "1.18.166"
3535

3636
env:
3737
ORGANIZATION: "zenika"

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Setup build arguments with default versions
2-
ARG AWS_CLI_VERSION=1.18.127
3-
ARG TERRAFORM_VERSION=0.13.1
2+
ARG AWS_CLI_VERSION=1.18.166
3+
ARG TERRAFORM_VERSION=0.13.5
44
ARG PYTHON_MAJOR_VERSION=3.7
5-
ARG DEBIAN_VERSION=buster-20200803-slim
5+
ARG DEBIAN_VERSION=buster-20201012-slim
66

77
# Download Terraform binary
88
FROM debian:${DEBIAN_VERSION} as terraform
@@ -29,7 +29,7 @@ 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 pip3 install setuptools==50.3.2
3333
RUN pip3 install awscli==${AWS_CLI_VERSION}
3434

3535
# Build final image

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Tools included:
3030

3131
* [AWS CLI](https://aws.amazon.com/fr/cli/)
3232
* Included version indicated in the image tag: `awscli-XX.YY.ZZ`
33-
* See available version on the [pip repository](https://pypi.org/project/awscli/#history)
33+
* See available version on the [project release page](https://github.com/aws/aws-cli/releases)
3434
* [Terraform CLI](https://www.terraform.io/docs/commands/index.html)
3535
* Included version indicated in the image tag: `terraform-XX.YY.ZZ`
3636
* See available versions on the [project release page](https://github.com/hashicorp/terraform/releases)
@@ -71,8 +71,8 @@ Optionally, it is possible to choose the tools desired versions using [Docker bu
7171
7272
```bash
7373
# Set tools desired versions
74-
AWS_CLI_VERSION=1.18.93
75-
TERRAFORM_VERSION=0.12.28
74+
AWS_CLI_VERSION=1.18.166
75+
TERRAFORM_VERSION=0.13.5
7676

7777
# launch the build script with parameters
7878
./dev-build.sh $AWS_CLI_VERSION $TERRAFORM_VERSION

tests/container-structure-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ commandTests:
2626
- name: "Check Terraform CLI version"
2727
command: "terraform"
2828
args: ["version"]
29-
expectedOutput: ["Terraform v0.13.1"]
29+
expectedOutput: ["Terraform v0.13.5"]
3030

3131
- name: "Check AWS CLI version"
3232
command: "aws"
3333
args: ["--version"]
34-
expectedOutput: ["aws-cli/1.18.127"]
34+
expectedOutput: ["aws-cli/1.18.166"]

0 commit comments

Comments
 (0)