Skip to content

Commit 2b1cf23

Browse files
author
Steve Kluck
authored
Move some images from jessie to stretch (#7)
- Add `awscli1.14` - Move `python2.7` from jessie to stretch (new tag `python2.7-debian9`) - Move `python3.6` from jessie to stretch (new tag `python3.6-debian9`) - Move `docker17.06` from jessie to stretch (same tag) - Move `docker18.03` from jessie to stretch (same tag) - Move `terraform0.11` from jessie to stretch (same tag) - Update to terraform 0.11.11 - Update to terragrunt from 0.14 to 0.18
1 parent 80030ec commit 2b1cf23

File tree

9 files changed

+45
-18
lines changed

9 files changed

+45
-18
lines changed

.circleci/config.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ workflows:
9191
requires:
9292
- build_awscli1_11
9393
- build_awscli1_14
94+
- build_awscli1_16
9495
- build_terraform0_11
9596
- build_docker17_06
9697
- build_docker18_03
@@ -106,10 +107,10 @@ workflows:
106107

107108
- fan_in_4:
108109
requires:
109-
- build_python_27_debian8
110+
- build_python_27_debian9
110111
- build_python_27_centos7
111112
- build_python_36_centos7
112-
- build_python_36_debian8
113+
- build_python_36_debian9
113114

114115
- build_node_48:
115116
requires: [ fan_in_4 ]
@@ -203,6 +204,9 @@ jobs:
203204
build_awscli1_14:
204205
<<: *build_image
205206
environment: [ { DOCKER_PATH: './tools/awscli/1.14', DOCKER_TAG: 'awscli1.14' } ]
207+
build_awscli1_16:
208+
<<: *build_image
209+
environment: [ { DOCKER_PATH: './tools/awscli/1.16', DOCKER_TAG: 'awscli1.16' } ]
206210
build_terraform0_11:
207211
<<: *build_image
208212
environment: [ { DOCKER_PATH: './tools/terraform/0.11', DOCKER_TAG: 'terraform0.11' } ]
@@ -216,16 +220,16 @@ jobs:
216220
fan_in_3:
217221
<<: *fan_in
218222

219-
build_python_27_debian8:
223+
build_python_27_debian9:
220224
<<: *build_image
221-
environment: [ { DOCKER_PATH: './python/2.7-debian', DOCKER_TAG: 'python2.7-debian8' } ]
225+
environment: [ { DOCKER_PATH: './python/2.7-debian', DOCKER_TAG: 'python2.7-debian9' } ]
222226
build_python_27_centos7:
223227
<<: *build_image
224228
environment: [ { DOCKER_PATH: './python/2.7', DOCKER_TAG: 'python2.7-centos7' } ]
225-
build_python_36_centos7:
229+
build_python_36_debian9:
226230
<<: *build_image
227-
environment: [ { DOCKER_PATH: './python/3.6-debian', DOCKER_TAG: 'python3.6-debian8' } ]
228-
build_python_36_debian8:
231+
environment: [ { DOCKER_PATH: './python/3.6-debian', DOCKER_TAG: 'python3.6-debian9' } ]
232+
build_python_36_centos7:
229233
<<: *build_image
230234
environment: [ { DOCKER_PATH: './python/3.6', DOCKER_TAG: 'python3.6-centos7' } ]
231235

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ Windows containers have all versions of .NET Framework 4.x and .NET Core 1.x and
3737

3838
- `awscli1.11` ([tools/awscli/1.11/Dockerfile](https://github.com/hal-platform/hal-build-environments/blob/master/tools/awscli/1.11/Dockerfile))
3939
- `awscli1.14` ([tools/awscli/1.14/Dockerfile](https://github.com/hal-platform/hal-build-environments/blob/master/tools/awscli/1.14/Dockerfile))
40-
40+
- `awscli1.16` ([tools/awscli/1.16/Dockerfile](https://github.com/hal-platform/hal-build-environments/blob/master/tools/awscli/1.16/Dockerfile))
41+
- `terraform0.11` ([tools/terraform/0.11/Dockerfile](https://github.com/hal-platform/hal-build-environments/blob/master/tools/terraform/0.11/Dockerfile))
42+
- `docker17.06` ([tools/docker/17.06/Dockerfile](https://github.com/hal-platform/hal-build-environments/blob/master/tools/docker/17.06/Dockerfile))
43+
- `docker18.03` ([tools/docker/18.03/Dockerfile](https://github.com/hal-platform/hal-build-environments/blob/master/tools/docker/18.03/Dockerfile))
4144

4245
#### Elixir
4346

python/2.7-debian/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM python:2.7.14-jessie
1+
FROM python:2.7.14-stretch

python/3.6-debian/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM python:3.6.2-jessie
1+
FROM python:3.6.2-stretch

tools/awscli/1.14/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM python:3.6.2-jessie
1+
FROM python:3.6.2-stretch
22

3-
ENV AWSCLI_VERSION 1.14.52
3+
ENV AWSCLI_VERSION 1.14.70
44

55
RUN \
66
curl -Lo "yq" "https://github.com/mikefarah/yq/releases/download/1.14.0/yq_linux_amd64" \

tools/awscli/1.16/Dockerfile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM python:3.6.2-stretch
2+
3+
ENV AWSCLI_VERSION 1.16.131
4+
5+
RUN \
6+
curl -Lo "yq" "https://github.com/mikefarah/yq/releases/download/1.14.0/yq_linux_amd64" \
7+
&& chmod +x yq \
8+
&& mv yq /usr/bin/yq \
9+
&& \
10+
apt-get update \
11+
&& \
12+
apt-get install -y --no-install-recommends \
13+
groff \
14+
less \
15+
jq \
16+
zip unzip \
17+
&& \
18+
rm -rf /var/lib/apt/lists/* \
19+
&& \
20+
pip install awscli=="${AWSCLI_VERSION}"

tools/docker/17.06/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM halplatform/hal-build-environments:debian8-buildpack
1+
FROM halplatform/hal-build-environments:debian9-buildpack
22

33
RUN \
44
apt-get update \

tools/docker/18.03/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM halplatform/hal-build-environments:debian8-buildpack
1+
FROM halplatform/hal-build-environments:debian9-buildpack
22

33
RUN \
44
apt-get update \

tools/terraform/0.11/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM python:3.6.2-jessie
1+
FROM python:3.6.2-stretch
22

3-
ENV AWSCLI_VERSION 1.15.16
3+
ENV AWSCLI_VERSION 1.16.131
44
RUN \
55
apt-get update \
66
&& \
@@ -21,7 +21,7 @@ RUN \
2121
&& chmod +x "yq" \
2222
&& mv "yq" "/usr/bin/yq"
2323

24-
ENV TERRAFORM_VERSION 0.11.7
24+
ENV TERRAFORM_VERSION 0.11.13
2525
RUN \
2626
curl -Lo "terraform.zip" "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" \
2727
\
@@ -31,7 +31,7 @@ RUN \
3131
&& chmod +x "terraform" \
3232
&& mv "terraform" "/usr/bin/terraform"
3333

34-
ENV TERRAGRUNT_VERSION 0.14.10
34+
ENV TERRAGRUNT_VERSION 0.18.2
3535
RUN \
3636
curl -Lo "terragrunt" "https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/terragrunt_linux_amd64" \
3737
\

0 commit comments

Comments
 (0)