Skip to content

Commit 4fa0440

Browse files
authored
🐳 Dockerfile rework and prepare terraform 0.13 beta1 release (#79)
* 🐳 extract debian base image version in arg, remove pyopenssl hack, bump setuptools vertsion * ⬆️ prepare terraform 0.13 beta release
1 parent 8e73b35 commit 4fa0440

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
versions:
3232
- { tf_version: "0.11.14", azcli_version: "2.7.0" }
3333
- { tf_version: "0.12.26", azcli_version: "2.7.0" }
34+
- { tf_version: "0.13.0-beta1", azcli_version: "2.7.0" }
3435

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

Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
ARG AZURE_CLI_VERSION=2.7.0
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-20191118-slim as terraform-cli
8+
FROM debian:${DEBIAN_VERSION} as terraform-cli
89
ARG TERRAFORM_VERSION
910
RUN apt-get update
1011
RUN apt-get install -y --no-install-recommends curl=7.64.0-4+deb10u1
@@ -22,21 +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 az CLI using PIP
25-
FROM debian:buster-20191118-slim as azure-cli
26+
FROM debian:${DEBIAN_VERSION} as azure-cli
2627
ARG AZURE_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 setuptools==47.1.1
3233
RUN pip3 install azure-cli==${AZURE_CLI_VERSION}
33-
# Fix an pyOpenSSL package issue... (see https://github.com/erjosito/ansible-azure-lab/issues/5)
34-
RUN pip3 uninstall -y pyOpenSSL cryptography
35-
RUN pip3 install pyOpenSSL==19.1.0
36-
RUN pip3 install cryptography==2.8
3734

3835
# Build final image
39-
FROM debian:buster-20191118-slim
36+
FROM debian:${DEBIAN_VERSION}
4037
LABEL maintainer="bgauduch@github"
4138
ARG PYTHON_MAJOR_VERSION
4239
RUN apt-get update \

0 commit comments

Comments
 (0)