Skip to content

Commit 407e029

Browse files
authored
Merge pull request #384 from aws/dockerfile-sync
Golang version upgrade and SSM agent update.
2 parents 18d59b2 + 50dd14d commit 407e029

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

al2/aarch64/standard/1.0/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ENV RUBY_VERSION="2.6.5" \
1919
NODE_VERSION="12.13.0" \
2020
NODE_10_VERSION="10.16.3" \
2121
NODE_8_VERSION="8.16.0" \
22-
GOLANG_VERSION="1.13.1" \
22+
GOLANG_VERSION="1.13.15" \
2323
GOLANG_12_VERSION="1.12.9" \
2424
DOCKER_18_VERSION="18.09.6" \
2525
DOCKER_VERSION="19.03.11" \
@@ -129,7 +129,7 @@ COPY ssh_config /root/.ssh/config
129129

130130
# Configure SSM
131131
RUN set -ex \
132-
&& yum install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_arm64/amazon-ssm-agent.rpm
132+
&& yum install -y https://s3.eu-north-1.amazonaws.com/amazon-ssm-eu-north-1/latest/linux_arm64/amazon-ssm-agent.rpm
133133
COPY amazon-ssm-agent.json /etc/amazon/ssm/
134134

135135
COPY runtimes.yml /codebuild/image/config/runtimes.yml
@@ -510,7 +510,7 @@ RUN set -ex \
510510
#**************** END JAVA ****************************************************
511511

512512
#**************** GO 1.13 **********************************************************
513-
ENV GOLANG_DOWNLOAD_SHA256="8af8787b7c2a3c0eb3f20f872577fcb6c36098bf725c59c4923921443084c807" \
513+
ENV GOLANG_DOWNLOAD_SHA256="a5c59e3f0aeaf6e939790152a8bfabb91d70c9787afb7aee06aef9bd4411c551" \
514514
GOPATH="/go" \
515515
DEP_VERSION="0.5.1" \
516516
DEP_BINARY="dep-linux-arm64"

al2/aarch64/standard/2.0/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3.us-we
8383

8484
# Configure SSM
8585
RUN set -ex \
86-
&& yum install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_arm64/amazon-ssm-agent.rpm
86+
&& yum install -y https://s3.eu-north-1.amazonaws.com/amazon-ssm-eu-north-1/latest/linux_arm64/amazon-ssm-agent.rpm
8787

8888
# Install env tools for runtimes
8989
## Dotnet
@@ -275,8 +275,8 @@ ENV GOPATH="/go" \
275275
DEP_VERSION="0.5.4" \
276276
DEP_BINARY="dep-linux-arm64"
277277

278-
ENV GOLANG_14_VERSION="1.14.4"
279-
ENV GOLANG_14_DOWNLOAD_SHA256="05dc46ada4e23a1f58e72349f7c366aae2e9c7a7f1e7653095538bc5bba5e077"
278+
ENV GOLANG_14_VERSION="1.14.7"
279+
ENV GOLANG_14_DOWNLOAD_SHA256="fe5b6f6e441f3cb7b53ebf1a010bbebcb720ac98124984cfe2e51d72b8a58c71"
280280

281281
RUN set -ex \
282282
&& mkdir -p "$GOPATH/src" "$GOPATH/bin" \
@@ -294,8 +294,8 @@ ENV PATH="$GOPATH/bin:/usr/local/go/bin:$PATH"
294294

295295
#**************** GO 1.13 **********************************************************
296296

297-
ENV GOLANG_13_VERSION="1.13.12"
298-
ENV GOLANG_13_DOWNLOAD_SHA256="7a8b4e7841d978c95dae8ef53e19811ee2d5c595a1c5ec7afed74bb8f71588b8"
297+
ENV GOLANG_13_VERSION="1.13.15"
298+
ENV GOLANG_13_DOWNLOAD_SHA256="a5c59e3f0aeaf6e939790152a8bfabb91d70c9787afb7aee06aef9bd4411c551"
299299

300300
RUN set -ex \
301301
&& wget -nv "https://dl.google.com/go/go$GOLANG_13_VERSION.linux-arm64.tar.gz" -O /tmp/golang.tar.gz \

al2/x86_64/standard/2.0/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-we
118118

119119
# Configure SSM
120120
RUN set -ex \
121-
&& yum install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm
121+
&& yum install -y https://s3.eu-north-1.amazonaws.com/amazon-ssm-eu-north-1/latest/linux_amd64/amazon-ssm-agent.rpm
122122

123123
# Install env tools for runtimes
124124
## Dotnet
@@ -346,7 +346,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin -
346346
#**************** END PHP ****************************************************
347347

348348
#**************** GOLANG ****************************************************
349-
ENV GOLANG_13_VERSION="1.13.8" \
349+
ENV GOLANG_13_VERSION="1.13.15" \
350350
GOLANG_12_VERSION="1.12.17"
351351

352352
ENV GOENV_DISABLE_GOPATH=1

al2/x86_64/standard/3.0/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3.us-we
119119

120120
# Configure SSM
121121
RUN set -ex \
122-
&& yum install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm
122+
&& yum install -y https://s3.eu-north-1.amazonaws.com/amazon-ssm-eu-north-1/latest/linux_amd64/amazon-ssm-agent.rpm
123123

124124
# Install env tools for runtimes
125125
## Dotnet
@@ -339,7 +339,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin -
339339
#**************** END PHP ****************************************************
340340

341341
#**************** GOLANG ****************************************************
342-
ENV GOLANG_13_VERSION="1.13.12" \
342+
ENV GOLANG_13_VERSION="1.13.15" \
343343
GOLANG_12_VERSION="1.12.17"
344344

345345
ENV GOENV_DISABLE_GOPATH=1
@@ -432,7 +432,7 @@ ENV RUBY_27_VERSION="2.7.1"
432432
RUN rbenv install $RUBY_27_VERSION; rm -rf /tmp/*; rbenv global $RUBY_27_VERSION;ruby -v
433433

434434
#Golang 14
435-
ENV GOLANG_14_VERSION="1.14.4"
435+
ENV GOLANG_14_VERSION="1.14.7"
436436
RUN goenv install $GOLANG_14_VERSION; rm -rf /tmp/*; \
437437
goenv global $GOLANG_14_VERSION
438438

ubuntu/standard/3.0/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-we
127127
RUN set -ex \
128128
&& mkdir /tmp/ssm \
129129
&& cd /tmp/ssm \
130-
&& wget https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/debian_amd64/amazon-ssm-agent.deb \
130+
&& wget https://s3.eu-north-1.amazonaws.com/amazon-ssm-eu-north-1/latest/debian_amd64/amazon-ssm-agent.deb \
131131
&& dpkg -i amazon-ssm-agent.deb
132132

133133
# Install env tools for runtimes
@@ -277,7 +277,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin -
277277
#**************** END PHP ****************************************************
278278

279279
#**************** GOLANG ****************************************************
280-
ENV GOLANG_13_VERSION="1.13.8" \
280+
ENV GOLANG_13_VERSION="1.13.15" \
281281
GOLANG_12_VERSION="1.12.17"
282282

283283
RUN goenv install $GOLANG_12_VERSION; rm -rf /tmp/*

ubuntu/standard/4.0/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3.us-we
128128
RUN set -ex \
129129
&& mkdir /tmp/ssm \
130130
&& cd /tmp/ssm \
131-
&& wget https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/debian_amd64/amazon-ssm-agent.deb \
131+
&& wget https://s3.eu-north-1.amazonaws.com/amazon-ssm-eu-north-1/latest/debian_amd64/amazon-ssm-agent.deb \
132132
&& dpkg -i amazon-ssm-agent.deb
133133

134134
# Install env tools for runtimes
@@ -285,7 +285,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin -
285285
#**************** END PHP ****************************************************
286286

287287
#**************** GOLANG ****************************************************
288-
ENV GOLANG_13_VERSION="1.13.12" \
288+
ENV GOLANG_13_VERSION="1.13.15" \
289289
GOLANG_12_VERSION="1.12.17"
290290

291291
RUN goenv install $GOLANG_12_VERSION; rm -rf /tmp/*
@@ -458,7 +458,7 @@ VOLUME /var/lib/docker
458458
FROM runtimes_n_corretto AS std_v4
459459

460460
# GoLang 14
461-
ENV GOLANG_14_VERSION="1.14.4"
461+
ENV GOLANG_14_VERSION="1.14.7"
462462
RUN goenv install $GOLANG_14_VERSION; rm -rf /tmp/*; \
463463
goenv global $GOLANG_14_VERSION
464464

0 commit comments

Comments
 (0)