Skip to content

Commit

Permalink
⬆️ Updated CLI, tooling and base image version for next release (#37)
Browse files Browse the repository at this point in the history
* ⬆️ bump default terraform, AWS cli and pip version, update tests, upgrade base debian image

* ⬆️ update supported Terraform and AWS cli version for next release
  • Loading branch information
bgauduch authored Aug 28, 2020
1 parent f7e46e4 commit 44c3f96
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ jobs:
matrix:
tf_version:
- "0.11.14"
- "0.12.28"
- "0.13.0-rc1"
- "0.12.29"
- "0.13.1"
awscli_version:
- "1.18.101"
- "1.18.102"
- "1.16.314"
- "1.17.17"
- "1.18.127"

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.102
ARG TERRAFORM_VERSION=0.12.28
ARG AWS_CLI_VERSION=1.18.127
ARG TERRAFORM_VERSION=0.13.1
ARG PYTHON_MAJOR_VERSION=3.7
ARG DEBIAN_VERSION=buster-20200514-slim
ARG DEBIAN_VERSION=buster-20200803-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==47.1.1
RUN pip3 install setuptools==49.6.0
RUN pip3 install awscli==${AWS_CLI_VERSION}

# Build final image
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.12.28"]
expectedOutput: ["Terraform v0.13.1"]

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

0 comments on commit 44c3f96

Please sign in to comment.