Skip to content

Commit

Permalink
⬆️ Terraform and AWS CLI Version update (#44)
Browse files Browse the repository at this point in the history
* ⬆️ 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
  • Loading branch information
bgauduch committed Oct 29, 2020
1 parent 3148cf4 commit 17c168d
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 13 deletions.
1 change: 1 addition & 0 deletions .github/workflows/lint-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- "!master"
paths-ignore:
- "!README.md"
- "!CODE_OF_CONDUCT.md.md"

env:
ORGANIZATION: "zenika"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/push-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
push:
branches:
- "master"
paths-ignore:
- "!README.md"
- "!CODE_OF_CONDUCT.md.md"

env:
ORGANIZATION: "zenika"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
tf_version:
- "0.11.14"
- "0.12.29"
- "0.13.1"
- "0.13.5"
- "0.14.0-beta1"
awscli_version:
- "1.16.314"
- "1.17.17"
- "1.18.127"
- "1.18.160"
- "1.18.166"

env:
ORGANIZATION: "zenika"
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Setup build arguments with default versions
ARG AWS_CLI_VERSION=1.18.127
ARG TERRAFORM_VERSION=0.13.1
ARG AWS_CLI_VERSION=1.18.166
ARG TERRAFORM_VERSION=0.13.5
ARG PYTHON_MAJOR_VERSION=3.7
ARG DEBIAN_VERSION=buster-20200803-slim
ARG DEBIAN_VERSION=buster-20201012-slim

# Download Terraform binary
FROM debian:${DEBIAN_VERSION} as terraform
Expand All @@ -29,7 +29,7 @@ ARG PYTHON_MAJOR_VERSION
RUN apt-get update
RUN apt-get install -y --no-install-recommends python3=${PYTHON_MAJOR_VERSION}.3-1
RUN apt-get install -y --no-install-recommends python3-pip=18.1-5
RUN pip3 install setuptools==49.6.0
RUN pip3 install setuptools==50.3.2
RUN pip3 install awscli==${AWS_CLI_VERSION}

# Build final image
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Tools included:

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

# launch the build script with parameters
./dev-build.sh $AWS_CLI_VERSION $TERRAFORM_VERSION
Expand Down
4 changes: 2 additions & 2 deletions tests/container-structure-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ commandTests:
- name: "Check Terraform CLI version"
command: "terraform"
args: ["version"]
expectedOutput: ["Terraform v0.13.1"]
expectedOutput: ["Terraform v0.13.5"]

- name: "Check AWS CLI version"
command: "aws"
args: ["--version"]
expectedOutput: ["aws-cli/1.18.127"]
expectedOutput: ["aws-cli/1.18.166"]

0 comments on commit 17c168d

Please sign in to comment.