Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 51b1e10

Browse files
authoredJun 5, 2020
🐳 Dockerfile update & Terraform 0.13 beta 1 release preparation (#31)
* 🐳 extracted debian version in arg, bumped debian, aws cli and setuptools versions, remove useless pip packages * 🔧 prepare Terraform 0.13 beta 1 release
1 parent e5e2cf8 commit 51b1e10

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed
 

‎.github/workflows/release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ jobs:
2929
strategy:
3030
matrix:
3131
versions:
32-
- { tf_version: "0.11.14", awscli_version: "1.18.70" }
33-
- { tf_version: "0.12.26", awscli_version: "1.18.70" }
32+
- { tf_version: "0.11.14", awscli_version: "1.18.72" }
33+
- { tf_version: "0.12.26", awscli_version: "1.18.72" }
34+
- { tf_version: "0.13.0-beta1", awscli_version: "1.18.72" }
3435

3536
env:
3637
TF_VERSION: ${{ matrix.versions.tf_version }}

‎Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Setup build arguments with default versions
2-
ARG AWS_CLI_VERSION=1.18.70
2+
ARG AWS_CLI_VERSION=1.18.72
33
ARG TERRAFORM_VERSION=0.12.26
44
ARG PYTHON_MAJOR_VERSION=3.7
5+
ARG DEBIAN_VERSION=buster-20200514-slim
56

67
# Download Terraform binary
7-
FROM debian:buster-20191224-slim as terraform
8+
FROM debian:${DEBIAN_VERSION} as terraform
89
ARG TERRAFORM_VERSION
910
RUN apt-get update
1011
RUN apt-get install --no-install-recommends -y curl=7.64.0-4+deb10u1
@@ -22,19 +23,17 @@ RUN grep terraform_${TERRAFORM_VERSION}_linux_amd64.zip terraform_${TERRAFORM_VE
2223
RUN unzip -j terraform_${TERRAFORM_VERSION}_linux_amd64.zip
2324

2425
# Install AWS CLI using PIP
25-
FROM debian:buster-20191224-slim as aws-cli
26+
FROM debian:${DEBIAN_VERSION} as aws-cli
2627
ARG AWS_CLI_VERSION
2728
ARG PYTHON_MAJOR_VERSION
2829
RUN apt-get update
2930
RUN apt-get install -y --no-install-recommends python3=${PYTHON_MAJOR_VERSION}.3-1
3031
RUN apt-get install -y --no-install-recommends python3-pip=18.1-5
31-
RUN pip3 install setuptools==46.1.3
32-
RUN pip3 install wheel==0.34.2
33-
RUN pip3 install pyyaml==5.3.1
32+
RUN pip3 install setuptools==47.1.1
3433
RUN pip3 install awscli==${AWS_CLI_VERSION}
3534

3635
# Build final image
37-
FROM debian:buster-20191224-slim
36+
FROM debian:${DEBIAN_VERSION}
3837
LABEL maintainer="bgauduch@github"
3938
ARG PYTHON_MAJOR_VERSION
4039
RUN apt-get update \

‎tests/container-structure-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ commandTests:
3131
- name: "Check AWS CLI version"
3232
command: "aws"
3333
args: ["--version"]
34-
expectedOutput: ["aws-cli/1.18.70"]
34+
expectedOutput: ["aws-cli/1.18.72"]

0 commit comments

Comments
 (0)
Please sign in to comment.