Skip to content

Commit b012b01

Browse files
naga-awsnaga-aws
committed
Adding Android 29, Go 1.13 and other minor version updates
1 parent a1eb6a5 commit b012b01

File tree

4 files changed

+170
-92
lines changed

4 files changed

+170
-92
lines changed

‎al2/x86_64/standard/1.0/Dockerfile

+43-28
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,25 @@
1111

1212
FROM amazonlinux:2
1313

14-
ENV RUBY_VERSION="2.6.3" \
15-
PYTHON_VERSION="3.7.3" \
16-
PHP_VERSION=7.3.6 \
17-
JAVA_VERSION=11 \
18-
NODE_VERSION="10.16.0" \
14+
ENV RUBY_VERSION="2.6.4" \
15+
PYTHON_VERSION="3.7.4" \
16+
PHP_VERSION=7.3.9 \
17+
JAVA_VERSION=11 \
18+
NODE_VERSION="10.16.3" \
1919
NODE_8_VERSION="8.16.0" \
20-
GOLANG_VERSION="1.12.5" \
21-
DOTNET_SDK_VERSION="2.2.300" \
20+
GOLANG_VERSION="1.13" \
21+
GOLANG_12_VERSION="1.12.9" \
22+
DOTNET_SDK_VERSION="2.2.402" \
2223
DOCKER_VERSION="18.09.6" \
2324
DOCKER_COMPOSE_VERSION="1.24.0"
2425

2526
ARG CHINA_REGION
2627

27-
#**************** Utilities *********************************************
28-
ENV DOCKER_BUCKET="download.docker.com" \
28+
#**************** Utilities *********************************************
29+
ENV DOCKER_BUCKET="download.docker.com" \
2930
DOCKER_CHANNEL="stable" \
3031
DOCKER_SHA256="1f3f6774117765279fce64ee7f76abbb5f260264548cf80631d68fb2d795bb09" \
31-
DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \
32+
DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \
3233
GITVERSION_VERSION="4.0.0" \
3334
DEBIAN_FRONTEND="noninteractive" \
3435
SRC_DIR="/usr/src" \
@@ -185,7 +186,7 @@ RUN set -ex \
185186

186187
#**************** PHP ****************************************************
187188
ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D
188-
ENV PHP_DOWNLOAD_SHA="fefc8967daa30ebc375b2ab2857f97da94ca81921b722ddac86b29e15c54a164" \
189+
ENV PHP_DOWNLOAD_SHA="4007f24a39822bef2805b75c625551d30be9eeed329d52eb0838fa5c1b91c1fd" \
189190
PHPPATH="/php" \
190191
PHP_INI_DIR="/usr/local/etc/php" \
191192
PHP_CFLAGS="-fstack-protector -fpic -fpie -O2" \
@@ -303,14 +304,16 @@ ENV JAVA_11_HOME="/opt/jvm/amazon-corretto-11" \
303304
INSTALLED_GRADLE_VERSIONS="4.10.3 5.4.1" \
304305
GRADLE_VERSION=5.4.1 \
305306
SBT_VERSION=1.2.8 \
306-
JDK_VERSION=11.0.3.7.1 \
307+
JDK_VERSION=11.0.4.11.1 \
307308
ANDROID_HOME="/usr/local/android-sdk-linux" \
308309
GRADLE_PATH="$SRC_DIR/gradle" \
309310
ANDROID_SDK_MANAGER_VER="4333796" \
310-
ANDROID_SDK_BUILD_TOOLS="build-tools;28.0.3" \
311-
ANDROID_SDK_PLATFORM_TOOLS="platforms;android-28" \
311+
ANDROID_SDK_BUILD_TOOLS="build-tools;29.0.2" \
312+
ANDROID_SDK_PLATFORM_TOOLS="platforms;android-29" \
313+
ANDROID_SDK_BUILD_TOOLS_28="build-tools;28.0.3" \
314+
ANDROID_SDK_PLATFORM_TOOLS_28="platforms;android-28" \
312315
ANDROID_SDK_EXTRAS="extras;android;m2repository extras;google;m2repository extras;google;google_play_services" \
313-
JDK_DOWNLOAD_SHA256="810e6a70a8170e72f9d0fd9a380ba1e36bff9e44435175ef509f3c8b3be93d4c" \
316+
JDK_DOWNLOAD_SHA256="aaf35f707ea12f5942c72ba70192444de19c4e1c7f5546ce2a0725093dde6fba" \
314317
ANT_DOWNLOAD_SHA512="c1a9694c3018e248000ff6f46d48af85f537ef3935e0d5256543c58a240084c0aff5289fd9e94cbc40d5442f3cc43592398047f2548fded40d9882be2b40750d" \
315318
MAVEN_DOWNLOAD_SHA512="b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544" \
316319
GRADLE_DOWNLOADS_SHA256="14cd15fc8cc8705bd69dcfa3c8fefb27eb7027f5de4b47a8b279218f76895a91 5.4.1\n336b6898b491f6334502d8074a6b8c2d73ed83b92123106bd4bf837f04111043 4.10.3" \
@@ -338,6 +341,7 @@ RUN set -ex \
338341
&& ln -s ${ANDROID_HOME}/tools/android /usr/bin/android \
339342
# Install Android
340343
&& android-accept-licenses.sh "env JAVA_HOME=$JAVA_8_HOME JRE_HOME=$JRE_8_HOME JDK_HOME=$JDK_8_HOME sdkmanager --verbose platform-tools ${ANDROID_SDK_BUILD_TOOLS} ${ANDROID_SDK_PLATFORM_TOOLS} ${ANDROID_SDK_EXTRAS} ${ANDROID_SDK_NDK_TOOLS}" \
344+
&& android-accept-licenses.sh "env JAVA_HOME=$JAVA_8_HOME JRE_HOME=$JRE_8_HOME JDK_HOME=$JDK_8_HOME sdkmanager --verbose platform-tools ${ANDROID_SDK_BUILD_TOOLS_28} ${ANDROID_SDK_PLATFORM_TOOLS_28}" \
341345
&& android-accept-licenses.sh "env JAVA_HOME=$JAVA_8_HOME JRE_HOME=$JRE_8_HOME JDK_HOME=$JDK_8_HOME sdkmanager --licenses" \
342346
# Install Amazon Corretto 11
343347
# Note: We will use update-alternatives to make sure JDK11 has higher priority for all the tools
@@ -388,8 +392,8 @@ RUN set -ex \
388392
&& rm -fr /tmp/* /var/tmp/*
389393
#**************** END JAVA ****************************************************
390394

391-
#**************** GO **********************************************************
392-
ENV GOLANG_DOWNLOAD_SHA256="aea86e3c73495f205929cfebba0d63f1382c8ac59be081b6351681415f4063cf" \
395+
#**************** GO (latest 1.13) **********************************************************
396+
ENV GOLANG_DOWNLOAD_SHA256="68a2297eb099d1a76097905a2ce334e3155004ec08cdea85f24527be3c48e856" \
393397
GOPATH="/go" \
394398
DEP_VERSION="0.5.1" \
395399
DEP_BINARY="dep-linux-amd64"
@@ -399,18 +403,33 @@ RUN set -ex \
399403
&& chmod -R 777 "$GOPATH" \
400404
&& wget "https://dl.google.com/go/go$GOLANG_VERSION.linux-amd64.tar.gz" -O /tmp/golang.tar.gz \
401405
&& echo "$GOLANG_DOWNLOAD_SHA256 /tmp/golang.tar.gz" | sha256sum -c - \
402-
&& tar -xzf /tmp/golang.tar.gz -C /usr/local \
406+
&& tar -xzf /tmp/golang.tar.gz -C /tmp \
407+
&& mv /tmp/go /usr/local/go13 \
403408
&& rm -fr /tmp/* /var/tmp/* \
404409
&& wget "https://github.com/golang/dep/releases/download/v$DEP_VERSION/$DEP_BINARY" -O "$GOPATH/bin/dep" \
405410
&& chmod +x "$GOPATH/bin/dep"
406411

412+
RUN ln -s /usr/local/go13 /usr/local/go
413+
407414
ENV PATH="$GOPATH/bin:/usr/local/go/bin:$PATH"
415+
416+
#*************** GO 1.12 *************************************************
417+
418+
ENV GOLANG_12_DOWNLOAD_SHA256="ac2a6efcc1f5ec8bdc0db0a988bb1d301d64b6d61b7e8d9e42f662fbb75a2b9b"
419+
420+
RUN set -ex \
421+
&& wget "https://dl.google.com/go/go$GOLANG_12_VERSION.linux-amd64.tar.gz" -O /tmp/golang.tar.gz \
422+
&& echo "$GOLANG_12_DOWNLOAD_SHA256 /tmp/golang.tar.gz" | sha256sum -c - \
423+
&& tar -xzf /tmp/golang.tar.gz -C /tmp \
424+
&& mv /tmp/go /usr/local/go12 \
425+
&& rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
426+
408427
#**************** END GO **********************************************************
409428

410429
#**************** .NET-CORE *******************************************************
411430
# Install .NET Core SDK
412431
ENV DOTNET_SDK_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz
413-
ENV DOTNET_SDK_DOWNLOAD_SHA 1D660A323180DF3DA8C6E0EA3F439D6BBEC29670D498AC884F38BF3CDFFBB041C7AFFF66171CDFD24C82394B845B135B057404DEF1FCE9F206853726382BC42B
432+
ENV DOTNET_SDK_DOWNLOAD_SHA 81937de0874ee837e3b42e36d1cf9e04bd9deff6ba60d0162ae7ca9336a78f733e624136d27f559728df3f681a72a669869bf91d02db47c5331398c0cfda9b44
414433

415434
RUN set -ex \
416435
&& curl -SL $DOTNET_SDK_DOWNLOAD_URL --output dotnet.tar.gz \
@@ -449,7 +468,7 @@ RUN set -ex \
449468
#**************** END .NET-CORE *******************************************************
450469

451470
# Download and set up GitVersion
452-
ENV LIBGIT2_PKG="https://rpmfind.net/linux/centos/7.6.1810/extras/x86_64/Packages/libgit2-0.26.6-1.el7.x86_64.rpm"
471+
ENV LIBGIT2_PKG="https://rpmfind.net/linux/centos/7/extras/x86_64/Packages/libgit2-0.26.6-1.el7.x86_64.rpm"
453472

454473
RUN set -ex \
455474
&& yum install -y $LIBGIT2_PKG \
@@ -482,19 +501,14 @@ RUN set -ex \
482501
&& ln -s /opt/geckodriver /usr/bin/geckodriver \
483502
&& geckodriver --version
484503

485-
# Install Chrome
486-
504+
# Install Chromium
487505
RUN set -ex \
488-
&& wget https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm -O /tmp/google-chrome.rpm \
489-
&& yum localinstall -y /tmp/google-chrome.rpm \
490-
&& rm /tmp/google-chrome.rpm \
491-
&& sed -i 's|HERE/chrome"|HERE/chrome" --disable-setuid-sandbox --no-sandbox|g' "/opt/google/chrome/google-chrome" \
492-
&& google-chrome --version
506+
&& yum install -y chromium
493507

494508
# Install ChromeDriver
495509

496510
RUN set -ex \
497-
&& CHROME_VERSION=`google-chrome --version | awk -F '[ .]' '{print $3"."$4"."$5}'` \
511+
&& CHROME_VERSION=`chromium-browser --version | awk -F '[ .]' '{print $2"."$3"."$4}'` \
498512
&& CHROME_DRIVER_VERSION=`wget -qO- chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_VERSION` \
499513
&& wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
500514
&& unzip /tmp/chromedriver_linux64.zip -d /opt \
@@ -509,3 +523,4 @@ RUN set -ex \
509523
&& yum clean all
510524

511525
ENTRYPOINT ["dockerd-entrypoint.sh"]
526+

‎al2/x86_64/standard/1.0/runtimes.yml

+20-8
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,16 @@ runtimes:
88
java: ["corretto8"]
99
commands:
1010
- echo "Installing Android version 28 ..."
11+
29:
12+
requires:
13+
java: ["corretto8"]
14+
commands:
15+
- echo "Installing Android version 29 ..."
1116
java:
1217
versions:
1318
corretto11:
1419
commands:
15-
- echo "Installing Java version 11 ..."
20+
- echo "Installing corretto(OpenJDK) version 11 ..."
1621

1722
- export JAVA_HOME="$JAVA_11_HOME"
1823

@@ -21,17 +26,17 @@ runtimes:
2126
- export JDK_HOME="$JDK_11_HOME"
2227

2328
- |-
24-
for tool_path in "$JAVA_HOME"/bin/*;
29+
for tool_path in "$JAVA_HOME"/bin/*;
2530
do tool=`basename "$tool_path"`;
26-
if [ $tool != 'java-rmi.cgi' ];
27-
then
31+
if [ $tool != 'java-rmi.cgi' ];
32+
then
2833
rm -f /usr/bin/$tool /var/lib/alternatives/$tool \
2934
&& update-alternatives --install /usr/bin/$tool $tool $tool_path 20000;
30-
fi;
35+
fi;
3136
done
3237
corretto8:
3338
commands:
34-
- echo "Installing Java version 8 ..."
39+
- echo "Installing corretto(OpenJDK) version 8 ..."
3540

3641
- export JAVA_HOME="$JAVA_8_HOME"
3742

@@ -53,6 +58,11 @@ runtimes:
5358
1.12:
5459
commands:
5560
- echo "Installing Go version 1.12 ..."
61+
- rm -rf /usr/local/go
62+
- ln -s /usr/local/go12 /usr/local/go
63+
1.13:
64+
commands:
65+
- echo "Installing Go version 1.13 ..."
5666
python:
5767
versions:
5868
3.7:
@@ -68,13 +78,13 @@ runtimes:
6878
2.6:
6979
commands:
7080
- echo "Installing Ruby version 2.6 ..."
71-
- rbenv global 2.6.3
81+
- rbenv global 2.6.4
7282
nodejs:
7383
versions:
7484
10:
7585
commands:
7686
- echo "Installing Node.js version 10 ..."
77-
- n 10.16.0
87+
- n 10.16.3
7888
8:
7989
commands:
8090
- echo "Installing Node.js version 8 ..."
@@ -89,3 +99,5 @@ runtimes:
8999
2.2:
90100
commands:
91101
- echo "Installing .NET version 2.2 ..."
102+
103+

0 commit comments

Comments
 (0)