Skip to content

Commit

Permalink
馃敄 Add Terrafom 0.13.0-rc1 ans AWS CLI 1.18.102 for release (#36)
Browse files Browse the repository at this point in the history
* 猬嗭笍 bump default awscli version to 1.18.102

* 馃敄 prepare release, add tf 0.13.0-rc1 and awscli 1.18.102 support
  • Loading branch information
bgauduch committed Jul 23, 2020
1 parent 6c14906 commit f7e46e4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@ jobs:
tf_version:
- "0.11.14"
- "0.12.28"
- "0.13.0-beta3"
- "0.13.0-rc1"
awscli_version:
- "1.18.101"
- "1.18.102"

env:
ORGANIZATION: "zenika"
IMAGE_NAME: "terraform-aws-cli"
AWS_CLI_VERSION: "1.18.93"

steps:
- name: Check out the repo
Expand All @@ -42,10 +44,10 @@ jobs:
run: echo "::set-env name=RELEASE_TAG::${GITHUB_REF##*/}"

- name: Build and save the image release tag
run: echo "::set-env name=IMAGE_TAG::release-${RELEASE_TAG}_terraform-${{ matrix.tf_version }}_awscli-${AWS_CLI_VERSION}"
run: echo "::set-env name=IMAGE_TAG::release-${RELEASE_TAG}_terraform-${{ matrix.tf_version }}_awscli-${{ matrix.awscli_version }}"

- name: Build image
run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AWS_CLI_VERSION=${AWS_CLI_VERSION} --tag ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_TAG}
run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AWS_CLI_VERSION=${{ matrix.awscli_version }} --tag ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_TAG}

- name: Login to Docker Hub registry
run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Setup build arguments with default versions
ARG AWS_CLI_VERSION=1.18.93
ARG AWS_CLI_VERSION=1.18.102
ARG TERRAFORM_VERSION=0.12.28
ARG PYTHON_MAJOR_VERSION=3.7
ARG DEBIAN_VERSION=buster-20200514-slim
Expand Down
2 changes: 1 addition & 1 deletion tests/container-structure-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ commandTests:
- name: "Check AWS CLI version"
command: "aws"
args: ["--version"]
expectedOutput: ["aws-cli/1.18.93"]
expectedOutput: ["aws-cli/1.18.102"]

0 comments on commit f7e46e4

Please sign in to comment.