Skip to content

Commit eac0aab

Browse files
subinatawssubinataws
authored
Merge pull request #453 from rasarora/master
Update Linux Images
2 parents 5524e63 + d945460 commit eac0aab

File tree

134 files changed

+70
-54
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+70
-54
lines changed

‎README.md

Lines changed: 8 additions & 8 deletions

‎al2/x86_64/standard/2.0/Dockerfile

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2019-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1+
# Copyright 2019-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
#
33
# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the License.
44
# A copy of the License is located at
@@ -117,7 +117,7 @@ RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-we
117117

118118
# Configure SSM
119119
RUN set -ex \
120-
&& yum install -y https://s3.eu-north-1.amazonaws.com/amazon-ssm-eu-north-1/latest/linux_amd64/amazon-ssm-agent.rpm
120+
&& yum install -y https://s3.amazonaws.com/amazon-ssm-us-east-1/2.3.1644.0/linux_amd64/amazon-ssm-agent.rpm
121121

122122
# Install env tools for runtimes
123123
## Dotnet
@@ -189,7 +189,8 @@ ENV JAVA_11_HOME="/opt/jvm/amazon-corretto-11" \
189189
ANT_DOWNLOAD_SHA512="c1a9694c3018e248000ff6f46d48af85f537ef3935e0d5256543c58a240084c0aff5289fd9e94cbc40d5442f3cc43592398047f2548fded40d9882be2b40750d" \
190190
MAVEN_DOWNLOAD_SHA512="c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0" \
191191
GRADLE_DOWNLOADS_SHA256="14cd15fc8cc8705bd69dcfa3c8fefb27eb7027f5de4b47a8b279218f76895a91 5.4.1\n336b6898b491f6334502d8074a6b8c2d73ed83b92123106bd4bf837f04111043 4.10.3" \
192-
ANDROID_SDK_MANAGER_SHA256="92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9"
192+
ANDROID_SDK_MANAGER_SHA256="92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9" \
193+
SBT_DOWNLOAD_SHA256="9bb9212541176d6fcce7bd12e4cf8a9c9649f5b63f88b3aff474e0b02c7cfe58"
193194

194195
ARG MAVEN_CONFIG_HOME="/root/.m2"
195196
ENV JDK_DOWNLOAD_TAR="amazon-corretto-${JDK_VERSION}-linux-x64.tar.gz" \
@@ -271,11 +272,14 @@ RUN set -ex \
271272
&& ln -s /usr/local/gradle-$GRADLE_VERSION/bin/gradle /usr/bin/gradle \
272273
&& rm -rf $GRADLE_PATH \
273274
# Install SBT
274-
&& wget -nv https://dl.bintray.com/sbt/rpm/sbt-$SBT_VERSION.rpm \
275-
&& yum install -y sbt-$SBT_VERSION.rpm \
276-
&& rm -fr sbt-$SBT_VERSION.rpm \
277-
# Cleanup
278-
&& rm -fr /tmp/* /var/tmp/*
275+
&& curl -fSL "https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" -o sbt.tgz \
276+
&& echo "${SBT_DOWNLOAD_SHA256} *sbt.tgz" | sha256sum -c - \
277+
&& tar xzvf sbt.tgz -C /usr/local/bin/ \
278+
&& rm sbt.tgz
279+
ENV PATH "/usr/local/bin/sbt/bin:$PATH"
280+
RUN sbt version
281+
# Cleanup
282+
RUN rm -fr /tmp/* /var/tmp/*
279283
#**************** END JAVA ****************************************************
280284

281285

‎al2/x86_64/standard/3.0/Dockerfile

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2020-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1+
# Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
#
33
# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the License.
44
# A copy of the License is located at
@@ -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.eu-north-1.amazonaws.com/amazon-ssm-eu-north-1/latest/linux_amd64/amazon-ssm-agent.rpm
121+
&& yum install -y https://s3.amazonaws.com/amazon-ssm-us-east-1/2.3.1644.0/linux_amd64/amazon-ssm-agent.rpm
122122

123123
# Install env tools for runtimes
124124
## Dotnet
@@ -188,7 +188,8 @@ ENV JAVA_11_HOME="/usr/lib/jvm/java-11-amazon-corretto.x86_64" \
188188
ANT_DOWNLOAD_SHA512="4d80dc6ba23eeec7769085ddb00261b7480b596b56c6e69aa221391acbfb7338eb5855179c88222c8021095ef1f64f43caf2b4f90e8305d7c3128026d4258d06" \
189189
MAVEN_DOWNLOAD_SHA512="c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0" \
190190
GRADLE_DOWNLOADS_SHA256="abc10bcedb58806e8654210f96031db541bcd2d6fc3161e81cb0572d6a15e821 5.6.4\n336b6898b491f6334502d8074a6b8c2d73ed83b92123106bd4bf837f04111043 4.10.3" \
191-
ANDROID_SDK_MANAGER_SHA256="92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9"
191+
ANDROID_SDK_MANAGER_SHA256="92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9" \
192+
SBT_DOWNLOAD_SHA256="9bb9212541176d6fcce7bd12e4cf8a9c9649f5b63f88b3aff474e0b02c7cfe58"
192193

193194
ARG MAVEN_CONFIG_HOME="/root/.m2"
194195
ENV JAVA_HOME="$JAVA_11_HOME" \
@@ -264,11 +265,14 @@ RUN set -ex \
264265
&& ln -s /usr/local/gradle-$GRADLE_VERSION/bin/gradle /usr/bin/gradle \
265266
&& rm -rf $GRADLE_PATH \
266267
# Install SBT
267-
&& wget -nv https://dl.bintray.com/sbt/rpm/sbt-$SBT_VERSION.rpm \
268-
&& yum install -y sbt-$SBT_VERSION.rpm \
269-
&& rm -fr sbt-$SBT_VERSION.rpm \
270-
# Cleanup
271-
&& rm -fr /tmp/* /var/tmp/*
268+
&& curl -fSL "https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" -o sbt.tgz \
269+
&& echo "${SBT_DOWNLOAD_SHA256} *sbt.tgz" | sha256sum -c - \
270+
&& tar xzvf sbt.tgz -C /usr/local/bin/ \
271+
&& rm sbt.tgz
272+
ENV PATH "/usr/local/bin/sbt/bin:$PATH"
273+
RUN sbt version
274+
# Cleanup
275+
RUN rm -fr /tmp/* /var/tmp/*
272276
#**************** END JAVA ****************************************************
273277

274278

‎ubuntu/standard/3.0/Dockerfile

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2019-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1+
# Copyright 2019-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
#
33
# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the License.
44
# A copy of the License is located at
@@ -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.eu-north-1.amazonaws.com/amazon-ssm-eu-north-1/latest/debian_amd64/amazon-ssm-agent.deb \
130+
&& wget https://s3.amazonaws.com/amazon-ssm-us-east-1/2.3.1644.0/debian_amd64/amazon-ssm-agent.deb \
131131
&& dpkg -i amazon-ssm-agent.deb
132132

133133
# Install env tools for runtimes
@@ -322,7 +322,8 @@ ENV JAVA_11_HOME="/opt/jvm/openjdk-11" \
322322
ANT_DOWNLOAD_SHA512="c1a9694c3018e248000ff6f46d48af85f537ef3935e0d5256543c58a240084c0aff5289fd9e94cbc40d5442f3cc43592398047f2548fded40d9882be2b40750d" \
323323
MAVEN_DOWNLOAD_SHA512="c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0" \
324324
GRADLE_DOWNLOADS_SHA256="14cd15fc8cc8705bd69dcfa3c8fefb27eb7027f5de4b47a8b279218f76895a91 5.4.1\n336b6898b491f6334502d8074a6b8c2d73ed83b92123106bd4bf837f04111043 4.10.3" \
325-
ANDROID_SDK_MANAGER_SHA256="92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9"
325+
ANDROID_SDK_MANAGER_SHA256="92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9" \
326+
SBT_DOWNLOAD_SHA256="9bb9212541176d6fcce7bd12e4cf8a9c9649f5b63f88b3aff474e0b02c7cfe58"
326327

327328
ENV JDK_DOWNLOAD_TAR="openjdk-${JDK_VERSION}_linux-x64_bin.tar.gz" \
328329
JAVA_HOME="$JAVA_11_HOME" \
@@ -409,15 +410,16 @@ RUN set -ex \
409410
&& ln -s /usr/local/gradle-$GRADLE_VERSION/bin/gradle /usr/bin/gradle \
410411
&& rm -rf $GRADLE_PATH
411412

412-
# Install SBT
413413
RUN set -ex \
414-
&& echo "deb https://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list \
415-
&& apt-get install -y --no-install-recommends apt-transport-https \
416-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823 \
417-
&& apt-get update \
418-
&& apt-get install -y --no-install-recommends sbt=$SBT_VERSION \
419-
# Cleanup
420-
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* \
414+
# Install SBT
415+
&& curl -fSL "https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" -o sbt.tgz \
416+
&& echo "${SBT_DOWNLOAD_SHA256} *sbt.tgz" | sha256sum -c - \
417+
&& tar xzvf sbt.tgz -C /usr/local/bin/ \
418+
&& rm sbt.tgz
419+
ENV PATH "/usr/local/bin/sbt/bin:$PATH"
420+
RUN sbt version
421+
# Cleanup
422+
RUN rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* \
421423
&& apt-get clean
422424
#**************** END JAVA ****************************************************
423425

‎ubuntu/standard/4.0/Dockerfile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2020-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1+
# Copyright 2019-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
#
33
# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the License.
44
# A copy of the License is located at
@@ -326,7 +326,8 @@ ENV JAVA_11_HOME="/usr/lib/jvm/java-11-amazon-corretto" \
326326
ANT_DOWNLOAD_SHA512="4d80dc6ba23eeec7769085ddb00261b7480b596b56c6e69aa221391acbfb7338eb5855179c88222c8021095ef1f64f43caf2b4f90e8305d7c3128026d4258d06" \
327327
MAVEN_DOWNLOAD_SHA512="c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0" \
328328
GRADLE_DOWNLOADS_SHA256="abc10bcedb58806e8654210f96031db541bcd2d6fc3161e81cb0572d6a15e821 5.6.4\n336b6898b491f6334502d8074a6b8c2d73ed83b92123106bd4bf837f04111043 4.10.3" \
329-
ANDROID_SDK_MANAGER_SHA256="92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9"
329+
ANDROID_SDK_MANAGER_SHA256="92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9" \
330+
SBT_DOWNLOAD_SHA256="9bb9212541176d6fcce7bd12e4cf8a9c9649f5b63f88b3aff474e0b02c7cfe58"
330331

331332
ARG MAVEN_CONFIG_HOME="/root/.m2"
332333

@@ -413,13 +414,14 @@ RUN set -ex \
413414
&& ln -s /usr/local/gradle-$GRADLE_VERSION/bin/gradle /usr/bin/gradle \
414415
&& rm -rf $GRADLE_PATH \
415416
# Install SBT
416-
&& echo "deb https://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list \
417-
&& apt-get install -y --no-install-recommends apt-transport-https \
418-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823 \
419-
&& apt-get update \
420-
&& apt-get install -y --no-install-recommends sbt=$SBT_VERSION \
421-
# Cleanup
422-
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* \
417+
&& curl -fSL "https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" -o sbt.tgz \
418+
&& echo "${SBT_DOWNLOAD_SHA256} *sbt.tgz" | sha256sum -c - \
419+
&& tar xzvf sbt.tgz -C /usr/local/bin/ \
420+
&& rm sbt.tgz
421+
ENV PATH "/usr/local/bin/sbt/bin:$PATH"
422+
RUN sbt version
423+
# Cleanup
424+
RUN rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* \
423425
&& apt-get clean
424426
#**************** END JAVA ****************************************************
425427

‎ubuntu/standard/5.0/Dockerfile

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2020-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1+
# Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
#
33
# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance with the License.
44
# A copy of the License is located at
@@ -49,7 +49,9 @@ RUN set -ex \
4949
python-openssl rsync sgml-base sgml-data stunnel \
5050
tar tcl tcl8.6 tk tk-dev unzip wget xfsprogs xml-core xmlto xsltproc \
5151
libzip5 libzip-dev vim xvfb xz-utils zip zlib1g-dev \
52-
&& rm -rf /var/lib/apt/lists/*
52+
&& rm -rf /var/lib/apt/lists/*
53+
54+
ENV LC_CTYPE="C.UTF-8"
5355

5456
RUN useradd codebuild-user
5557

@@ -158,7 +160,7 @@ FROM tools AS runtimes
158160
#**************** .NET-CORE *******************************************************
159161

160162
ENV DOTNET_31_SDK_VERSION="3.1.404"
161-
ENV DOTNET_5_SDK_VERSION="5.0.101"
163+
ENV DOTNET_5_SDK_VERSION="5.0.202"
162164
ENV DOTNET_ROOT="/root/.dotnet"
163165

164166
# Add .NET Core 3.1 Global Tools install folder to PATH
@@ -309,6 +311,7 @@ ARG GRADLE_PATH="$SRC_DIR/gradle"
309311
ARG ANT_DOWNLOAD_SHA512="ed73febff2803079d13117e18a22697eecdac64c9c52fc5259ac880d7b07f527d8ce3779851af0cda5798a368ebc979d43dd7085a0a62af57df23ff3d105dd6f"
310312
ARG MAVEN_DOWNLOAD_SHA512="c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0"
311313
ARG GRADLE_DOWNLOADS_SHA256="abc10bcedb58806e8654210f96031db541bcd2d6fc3161e81cb0572d6a15e821 5.6.4\n0080de8491f0918e4f529a6db6820fa0b9e818ee2386117f4394f95feb1d5583 6.7"
314+
ARG SBT_DOWNLOAD_SHA256="5cf648f18ee9573cd26970999ae4e76ac034721a671bb45e7311c6d1375f9d33"
312315

313316
ARG MAVEN_CONFIG_HOME="/root/.m2"
314317

@@ -380,13 +383,14 @@ RUN set -ex \
380383
&& ln -s /usr/local/gradle-$GRADLE_VERSION/bin/gradle /usr/bin/gradle \
381384
&& rm -rf $GRADLE_PATH \
382385
# Install SBT
383-
&& echo "deb https://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list \
384-
&& apt-get install -y --no-install-recommends apt-transport-https \
385-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823 \
386-
&& apt-get update \
387-
&& apt-get install -y --no-install-recommends sbt=$SBT_VERSION \
388-
# Cleanup
389-
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* \
386+
&& curl -fSL "https://github.com/sbt/sbt/releases/download/v${SBT_VERSION}/sbt-${SBT_VERSION}.tgz" -o sbt.tgz \
387+
&& echo "${SBT_DOWNLOAD_SHA256} *sbt.tgz" | sha256sum -c - \
388+
&& tar xzvf sbt.tgz -C /usr/local/bin/ \
389+
&& rm sbt.tgz
390+
ENV PATH "/usr/local/bin/sbt/bin:$PATH"
391+
RUN sbt version -Dsbt.rootdir=true
392+
# Cleanup
393+
RUN rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/* \
390394
&& apt-get clean
391395
#**************** END JAVA ****************************************************
392396

‎al2/x86_64/standard/1.0/Dockerfile renamed to ‎unsupported_images/al2/x86_64/standard/1.0/Dockerfile

File renamed without changes.

‎al2/x86_64/standard/1.0/amazon-ssm-agent.json renamed to ‎unsupported_images/al2/x86_64/standard/1.0/amazon-ssm-agent.json

File renamed without changes.

‎al2/x86_64/standard/1.0/dockerd-entrypoint.sh renamed to ‎unsupported_images/al2/x86_64/standard/1.0/dockerd-entrypoint.sh

File renamed without changes.

‎al2/x86_64/standard/1.0/legal/THIRD_PARTY_LICENSES.txt renamed to ‎unsupported_images/al2/x86_64/standard/1.0/legal/THIRD_PARTY_LICENSES.txt

File renamed without changes.

0 commit comments

Comments
 (0)