Skip to content

Commit 2dea17b

Browse files
authored
Update linux dockerfiles for standard:5.0,standard:4.0,amazonlinux2:3.0 (#535)
* Update linux dockerfiles for standard:5.0,standard:4.0,amazonlinux2:3.0
1 parent 282c663 commit 2dea17b

File tree

28 files changed

+263
-274
lines changed

28 files changed

+263
-274
lines changed

al2/x86_64/standard/3.0/Dockerfile

+28-27
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ RUN set -ex \
9696

9797
# Install stunnel
9898
RUN set -ex \
99-
&& STUNNEL_VERSION=5.56 \
99+
&& STUNNEL_VERSION=5.64 \
100100
&& STUNNEL_TAR=stunnel-$STUNNEL_VERSION.tar.gz \
101-
&& STUNNEL_SHA256="7384bfb356b9a89ddfee70b5ca494d187605bb516b4fff597e167f97e2236b22" \
101+
&& STUNNEL_SHA256="eebe53ed116ba43b2e786762b0c2b91511e7b74857ad4765824e7199e6faf883" \
102102
&& curl -o $STUNNEL_TAR https://www.usenix.org.uk/mirrors/stunnel/archive/5.x/$STUNNEL_TAR && echo "$STUNNEL_SHA256 $STUNNEL_TAR" | sha256sum --check && tar xfz $STUNNEL_TAR \
103103
&& cd stunnel-$STUNNEL_VERSION \
104104
&& ./configure \
@@ -111,15 +111,15 @@ RUN set -ex \
111111

112112
# AWS Tools
113113
# https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI_installation.html
114-
RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.16.8/2020-04-16/bin/linux/amd64/aws-iam-authenticator \
115-
&& curl -sS -o /usr/local/bin/kubectl https://amazon-eks.s3.us-west-2.amazonaws.com/1.16.8/2020-04-16/bin/linux/amd64/kubectl \
114+
RUN curl -sS -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.22.6/2022-03-09/bin/linux/amd64/aws-iam-authenticator \
115+
&& curl -sS -o /usr/local/bin/kubectl https://amazon-eks.s3.us-west-2.amazonaws.com/1.22.6/2022-03-09/bin/linux/amd64/kubectl \
116116
&& curl -sS -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest \
117117
&& curl -sS -L https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_Linux_amd64.tar.gz | tar xz -C /usr/local/bin \
118118
&& chmod +x /usr/local/bin/kubectl /usr/local/bin/aws-iam-authenticator /usr/local/bin/ecs-cli /usr/local/bin/eksctl
119119

120120
# Configure SSM
121121
RUN set -ex \
122-
&& yum install -y -q https://s3.amazonaws.com/amazon-ssm-us-east-1/3.0.1390.0/linux_amd64/amazon-ssm-agent.rpm
122+
&& yum install -y -q https://s3.amazonaws.com/amazon-ssm-us-east-1/3.1.1374.0/linux_amd64/amazon-ssm-agent.rpm
123123

124124
# Install env tools for runtimes
125125
## Dotnet
@@ -172,12 +172,12 @@ ENV JAVA_11_HOME="/usr/lib/jvm/java-11-amazon-corretto.x86_64" \
172172
JAVA_8_HOME="/usr/lib/jvm/java-1.8.0-amazon-corretto.x86_64" \
173173
JDK_8_HOME="/usr/lib/jvm/java-1.8.0-amazon-corretto.x86_64" \
174174
JRE_8_HOME="/usr/lib/jvm/java-1.8.0-amazon-corretto.x86_64/jre" \
175-
ANT_VERSION=1.10.8 \
175+
ANT_VERSION=1.10.12 \
176176
MAVEN_HOME="/opt/maven" \
177177
MAVEN_VERSION=3.6.3 \
178178
INSTALLED_GRADLE_VERSIONS="4.10.3 5.6.4" \
179179
GRADLE_VERSION=5.6.4 \
180-
SBT_VERSION=1.6.1 \
180+
SBT_VERSION=1.6.2 \
181181
ANDROID_HOME="/usr/local/android-sdk-linux" \
182182
GRADLE_PATH="$SRC_DIR/gradle" \
183183
ANDROID_SDK_MANAGER_VER="4333796" \
@@ -186,11 +186,11 @@ ENV JAVA_11_HOME="/usr/lib/jvm/java-11-amazon-corretto.x86_64" \
186186
ANDROID_SDK_BUILD_TOOLS_28="build-tools;28.0.3" \
187187
ANDROID_SDK_PLATFORM_TOOLS_28="platforms;android-28" \
188188
ANDROID_SDK_EXTRAS="extras;android;m2repository extras;google;m2repository extras;google;google_play_services" \
189-
ANT_DOWNLOAD_SHA512="4d80dc6ba23eeec7769085ddb00261b7480b596b56c6e69aa221391acbfb7338eb5855179c88222c8021095ef1f64f43caf2b4f90e8305d7c3128026d4258d06" \
189+
ANT_DOWNLOAD_SHA512="2287dc5cfc21043c14e5413f9afb1c87c9f266ec2a9ba2d3bf2285446f6e4ccb59b558bf2e5c57911a05dfa293c7d5c7ad60ac9f744ba11406f4e6f9a27b2403" \
190190
MAVEN_DOWNLOAD_SHA512="c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0" \
191191
GRADLE_DOWNLOADS_SHA256="abc10bcedb58806e8654210f96031db541bcd2d6fc3161e81cb0572d6a15e821 5.6.4\n336b6898b491f6334502d8074a6b8c2d73ed83b92123106bd4bf837f04111043 4.10.3" \
192192
ANDROID_SDK_MANAGER_SHA256="92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9" \
193-
SBT_DOWNLOAD_SHA256="60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc" \
193+
SBT_DOWNLOAD_SHA256="637637b6c4e6fa04ab62cd364061e32b12480b09001cd23303df62b36fadd440" \
194194
LOG4J_UNSAFE_VERSIONS="2.11.1 1.2.8"
195195

196196
ARG MAVEN_CONFIG_HOME="/root/.m2"
@@ -231,7 +231,7 @@ RUN set -x \
231231
update-alternatives --install /usr/bin/$tool $tool $tool_path 10000; \
232232
update-alternatives --set $tool $tool_path; \
233233
done \
234-
&& rm $JAVA_HOME/lib/security/cacerts && ln -s /etc/pki/java/cacerts $JAVA_HOME/lib/security/cacerts \
234+
&& rm $JAVA_HOME/lib/security/cacerts && ln -s /etc/pki/java/cacerts $JAVA_HOME/lib/security/cacerts \
235235
# Install Ant
236236
&& curl -LSso /var/tmp/apache-ant-$ANT_VERSION-bin.tar.gz https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VERSION-bin.tar.gz \
237237
&& echo "$ANT_DOWNLOAD_SHA512 /var/tmp/apache-ant-$ANT_VERSION-bin.tar.gz" | sha512sum -c - \
@@ -306,7 +306,7 @@ ENV NODE_10_VERSION="10.24.1"
306306
RUN n $NODE_10_VERSION && npm install --save-dev -g -f grunt && npm install --save-dev -g -f grunt-cli && npm install --save-dev -g -f webpack \
307307
&& curl -sSL https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo \
308308
&& rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg \
309-
&& yum install -y https://download-ib01.fedoraproject.org/pub/epel/8/Modular/x86_64/Packages/l/libuv-1.43.0-2.module_el8+13774+f8c1f5a5.x86_64.rpm \
309+
&& yum install -y https://download-ib01.fedoraproject.org/pub/epel/8/Modular/x86_64/Packages/l/libuv-1.43.0-2.module_el8+13804+34326f90.x86_64.rpm \
310310
&& yum install -y -q yarn \
311311
&& yarn --version \
312312
&& cd / && rm -rf $N_SRC_DIR && rm -rf /tmp/*
@@ -315,14 +315,14 @@ RUN n $NODE_10_VERSION && npm install --save-dev -g -f grunt && npm install --s
315315

316316
#**************** RUBY *********************************************************
317317

318-
ENV RUBY_26_VERSION="2.6.6"
318+
ENV RUBY_26_VERSION="2.6.10"
319319

320320
RUN rbenv install $RUBY_26_VERSION && rm -rf /tmp/* && rbenv global $RUBY_26_VERSION && ruby -v
321321

322322
#**************** END RUBY *****************************************************
323323

324324
#**************** PYTHON *****************************************************
325-
ENV PYTHON_37_VERSION="3.7.10"
325+
ENV PYTHON_37_VERSION="3.7.13"
326326
ENV PYTHON_PIP_VERSION=21.1.2
327327
ENV PYYAML_VERSION=5.4.1
328328

@@ -337,7 +337,7 @@ RUN set -ex \
337337
#**************** END PYTHON *****************************************************
338338

339339
#**************** PHP ****************************************************
340-
ENV PHP_73_VERSION="7.3.19"
340+
ENV PHP_73_VERSION="7.3.33"
341341

342342
COPY tools/runtime_configs/php/$PHP_73_VERSION /root/.phpenv/plugins/php-build/share/php-build/definitions/$PHP_73_VERSION
343343
RUN phpenv install $PHP_73_VERSION && rm -rf /tmp/* && phpenv global $PHP_73_VERSION
@@ -370,8 +370,8 @@ ENV DOCKER_BUCKET="download.docker.com" \
370370
DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \
371371
DOCKER_COMPOSE_VERSION="1.26.0"
372372

373-
ENV DOCKER_SHA256="dd6ff72df1edfd61ae55feaa4aadb88634161f0aa06dbaaf291d1be594099ff3"
374-
ENV DOCKER_VERSION="20.10.11"
373+
ENV DOCKER_SHA256="9ccfc39305ae1d8882d18c9c431544fca82913d6df717409ac2244ac58c4f070"
374+
ENV DOCKER_VERSION="20.10.15"
375375

376376
VOLUME /var/lib/docker
377377

@@ -392,7 +392,7 @@ RUN set -ex \
392392
&& docker-compose version
393393

394394
#Python 3.8
395-
ENV PYTHON_38_VERSION="3.8.10"
395+
ENV PYTHON_38_VERSION="3.8.13"
396396

397397
COPY tools/runtime_configs/python/$PYTHON_38_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_38_VERSION
398398
RUN env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSION && rm -rf /tmp/*
@@ -403,7 +403,7 @@ RUN set -ex \
403403
&& pip3 install --no-cache-dir --upgrade 'setuptools==57.4.0' wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
404404

405405
#Python 3.9
406-
ENV PYTHON_39_VERSION="3.9.5"
406+
ENV PYTHON_39_VERSION="3.9.12"
407407

408408
COPY tools/runtime_configs/python/$PYTHON_39_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_39_VERSION
409409
RUN env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_39_VERSION && rm -rf /tmp/*
@@ -414,7 +414,7 @@ RUN set -ex \
414414
&& pip3 install --no-cache-dir --upgrade 'setuptools==57.4.0' wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
415415

416416
# Node 12
417-
ENV NODE_12_VERSION="12.22.2"
417+
ENV NODE_12_VERSION="12.22.12"
418418

419419
RUN n $NODE_12_VERSION && npm install --save-dev -g -f grunt && npm install --save-dev -g -f grunt-cli && npm install --save-dev -g -f webpack \
420420
&& rm -rf /tmp/*
@@ -423,9 +423,10 @@ RUN n $NODE_12_VERSION && npm install --save-dev -g -f grunt && npm install --s
423423
FROM runtimes_2 AS runtimes_3
424424

425425
#DotNet 3.1
426-
ENV DOTNET_31_SDK_VERSION="3.1.301"
426+
ENV DOTNET_31_SDK_VERSION="3.1.419"
427427
ENV DOTNET_ROOT="/root/.dotnet"
428428

429+
# Add .NET Core 3.1 Global Tools install folder to PATH
429430
RUN /usr/local/bin/dotnet-install.sh -v $DOTNET_31_SDK_VERSION \
430431
&& dotnet --list-sdks \
431432
&& rm -rf /tmp/*
@@ -447,15 +448,15 @@ RUN set -ex \
447448
&& ln -s ~/.dotnet/tools/dotnet-gitversion /usr/local/bin/gitversion
448449

449450
#Ruby 2.7
450-
ENV RUBY_27_VERSION="2.7.2"
451+
ENV RUBY_27_VERSION="2.7.6"
451452
RUN rbenv install $RUBY_27_VERSION && rm -rf /tmp/* && rbenv global $RUBY_27_VERSION && ruby -v
452453

453454
#Golang 14
454-
ENV GOLANG_14_VERSION="1.14.12"
455+
ENV GOLANG_14_VERSION="1.14.15"
455456
RUN goenv install $GOLANG_14_VERSION && rm -rf /tmp/* && goenv global $GOLANG_14_VERSION
456457

457458
#Php 7.4
458-
ENV PHP_74_VERSION="7.4.7"
459+
ENV PHP_74_VERSION="7.4.29"
459460
COPY tools/runtime_configs/php/$PHP_74_VERSION /root/.phpenv/plugins/php-build/share/php-build/definitions/$PHP_74_VERSION
460461
RUN phpenv install $PHP_74_VERSION && rm -rf /tmp/* && phpenv global $PHP_74_VERSION
461462
RUN echo "memory_limit = 1G;" >> "/root/.phpenv/versions/$PHP_74_VERSION/etc/conf.d/memory.ini"
@@ -473,10 +474,10 @@ FROM runtimes_3 AS al2_v3
473474
# Configure SSH
474475
COPY ssh_config /root/.ssh/config
475476
COPY runtimes.yml /codebuild/image/config/runtimes.yml
476-
COPY dockerd-entrypoint.sh /usr/local/bin/
477-
COPY legal/THIRD_PARTY_LICENSES.txt /usr/share/doc
478-
COPY legal/bill_of_material.txt /usr/share/doc
479-
COPY amazon-ssm-agent.json /etc/amazon/ssm/
477+
COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh
478+
COPY legal/THIRD_PARTY_LICENSES.txt /usr/share/doc/THIRD_PARTY_LICENSES.txt
479+
COPY legal/bill_of_material.txt /usr/share/doc/bill_of_material.txt
480+
COPY amazon-ssm-agent.json /etc/amazon/ssm/amazon-ssm-agent.json
480481

481482
ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"]
482483

al2/x86_64/standard/3.0/tools/runtime_configs/php/7.3.19 renamed to al2/x86_64/standard/3.0/tools/runtime_configs/php/7.3.33

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ configure_option "--with-pdo-pgsql"
55

66
PHP_BUILD_EXTRA_MAKE_ARGUMENTS="-j4"
77

8-
#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/7.3.19
8+
#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/7.3.33
99
#Don't change beyond this line
1010

1111
configure_option "--without-pear"
@@ -14,7 +14,6 @@ configure_option "--with-png-dir" "/usr"
1414
configure_option "--with-jpeg-dir" "/usr"
1515
configure_option "--enable-zip"
1616

17-
install_package "https://secure.php.net/distributions/php-7.3.19.tar.bz2"
18-
install_xdebug "2.9.6"
17+
install_package "https://secure.php.net/distributions/php-7.3.33.tar.bz2"
18+
install_xdebug "3.1.3"
1919
enable_builtin_opcache
20-

al2/x86_64/standard/3.0/tools/runtime_configs/php/7.4.7 renamed to al2/x86_64/standard/3.0/tools/runtime_configs/php/7.4.29

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ configure_option "--with-libedit"
55

66
PHP_BUILD_EXTRA_MAKE_ARGUMENTS="-j4"
77

8-
#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/7.4.7
8+
#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/7.4.29
99
#Don't change beyond this line
1010

1111
configure_option "--enable-gd"
1212
configure_option "--with-jpeg"
1313
configure_option "--with-zip"
1414

15-
install_package "https://secure.php.net/distributions/php-7.4.7.tar.bz2"
16-
install_xdebug "2.9.6"
15+
install_package "https://secure.php.net/distributions/php-7.4.29.tar.bz2"
16+
install_xdebug "3.1.3"
1717
enable_builtin_opcache
1818

al2/x86_64/standard/3.0/tools/runtime_configs/python/3.7.10

-19
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
export PYTHON_CONFIGURE_OPTS="\
2+
--enable-shared
3+
--enable-loadable-sqlite-extensions"
4+
5+
# Don't change below this line.
6+
# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.7.13
7+
8+
#require_gcc
9+
prefer_openssl11
10+
export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
11+
install_package "openssl-1.1.1n" "https://www.openssl.org/source/openssl-1.1.1n.tar.gz#40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a" mac_openssl --if has_broken_mac_openssl
12+
install_package "readline-8.1" "https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz#f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02" mac_readline --if has_broken_mac_readline
13+
if has_tar_xz_support; then
14+
install_package "Python-3.7.13" "https://www.python.org/ftp/python/3.7.13/Python-3.7.13.tar.xz#99f106275df8899c3e8cb9d7c01ce686c202ef275953301427194693de5bef84" standard verify_py37 copy_python_gdb ensurepip
15+
else
16+
install_package "Python-3.7.13" "https://www.python.org/ftp/python/3.7.13/Python-3.7.13.tgz#e405417f50984bc5870c7e7a9f9aeb93e9d270f5ac67f667a0cd3a09439682b5" standard verify_py37 copy_python_gdb ensurepip
17+
fi

al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.10

-17
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
export PYTHON_CONFIGURE_OPTS="\
2+
--enable-shared
3+
--enable-loadable-sqlite-extensions"
4+
5+
# Don't change below this line.
6+
# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.13
7+
8+
#require_gcc
9+
prefer_openssl11
10+
export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
11+
install_package "openssl-1.1.1n" "https://www.openssl.org/source/openssl-1.1.1n.tar.gz#40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a" mac_openssl --if has_broken_mac_openssl
12+
install_package "readline-8.1" "https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz#f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02" mac_readline --if has_broken_mac_readline
13+
if has_tar_xz_support; then
14+
install_package "Python-3.8.13" "https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz#6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57" standard verify_py38 copy_python_gdb ensurepip
15+
else
16+
install_package "Python-3.8.13" "https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tgz#903b92d76354366b1d9c4434d0c81643345cef87c1600adfa36095d7b00eede4" standard verify_py38 copy_python_gdb ensurepip
17+
fi
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
export PYTHON_CONFIGURE_OPTS="\
2+
--enable-shared
3+
--enable-loadable-sqlite-extensions"
4+
5+
# Don't change below this line.
6+
# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.9.12
7+
8+
#require_gcc
9+
prefer_openssl11
10+
export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
11+
install_package "openssl-1.1.1n" "https://www.openssl.org/source/openssl-1.1.1n.tar.gz#40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a" mac_openssl --if has_broken_mac_openssl
12+
install_package "readline-8.1" "https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz#f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02" mac_readline --if has_broken_mac_readline
13+
if has_tar_xz_support; then
14+
install_package "Python-3.9.12" "https://www.python.org/ftp/python/3.9.12/Python-3.9.12.tar.xz#2cd94b20670e4159c6d9ab57f91dbf255b97d8c1a1451d1c35f4ec1968adf971" standard verify_py39 copy_python_gdb ensurepip
15+
else
16+
install_package "Python-3.9.12" "https://www.python.org/ftp/python/3.9.12/Python-3.9.12.tgz#70e08462ebf265012bd2be88a63d2149d880c73e53f1712b7bbbe93750560ae8" standard verify_py39 copy_python_gdb ensurepip
17+
fi

al2/x86_64/standard/3.0/tools/runtime_configs/python/3.9.5

-17
This file was deleted.

0 commit comments

Comments
 (0)