Skip to content

Commit 5922879

Browse files
subinatawssubinataws
authored
Merge pull request #435 from xgnl/master
Update Python runtime versions
2 parents 15e7890 + 2041aaa commit 5922879

File tree

24 files changed

+175
-176
lines changed

24 files changed

+175
-176
lines changed

‎al2/x86_64/standard/2.0/Dockerfile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
FROM amazonlinux:2 AS core
1313

14-
ENV EPEL_REPO="https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
15-
1614
# Install git, SSH, and other utilities
1715
RUN set -ex \
1816
&& yum install -y openssh-clients \
@@ -21,7 +19,7 @@ RUN set -ex \
2119
&& ssh-keyscan -t rsa,dsa -H github.com >> ~/.ssh/known_hosts \
2220
&& ssh-keyscan -t rsa,dsa -H bitbucket.org >> ~/.ssh/known_hosts \
2321
&& chmod 600 ~/.ssh/known_hosts \
24-
&& yum install -y $EPEL_REPO \
22+
&& amazon-linux-extras install epel -y \
2523
&& rpm --import https://download.mono-project.com/repo/xamarin.gpg \
2624
&& curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo \
2725
&& amazon-linux-extras enable corretto8 \
@@ -37,7 +35,8 @@ RUN set -ex \
3735
ncurses-devel oniguruma-devel openssl openssl-devel perl-DBD-SQLite \
3836
perl-DBI perl-HTTP-Date perl-IO-Pty-Easy perl-TimeDate perl-YAML-LibYAML \
3937
postgresql-devel procps-ng python-configobj readline-devel rsync sgml-common \
40-
subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel
38+
subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel \
39+
&& rm /etc/yum.repos.d/mono-centos7-stable.repo
4140

4241
RUN useradd codebuild-user
4342

@@ -125,7 +124,7 @@ RUN set -ex \
125124
ENV PATH="/root/.dotnet/:/root/.dotnet/tools/:$PATH"
126125
RUN set -ex \
127126
&& wget -nv -O /usr/local/bin/dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
128-
&& chmod +x /usr/local/bin/dotnet-install.sh
127+
&& chmod +x /usr/local/bin/dotnet-install.sh
129128

130129
##nodejs
131130
ENV N_SRC_DIR="$SRC_DIR/n"
@@ -242,7 +241,7 @@ RUN set -x \
242241
&& echo "$ANT_DOWNLOAD_SHA512 /var/tmp/apache-ant-$ANT_VERSION-bin.tar.gz" | sha512sum -c - \
243242
&& tar -xzf /var/tmp/apache-ant-$ANT_VERSION-bin.tar.gz -C /opt \
244243
&& rm /var/tmp/apache-ant-$ANT_VERSION-bin.tar.gz \
245-
&& update-alternatives --install /usr/bin/ant ant /opt/apache-ant-$ANT_VERSION/bin/ant 10000
244+
&& update-alternatives --install /usr/bin/ant ant /opt/apache-ant-$ANT_VERSION/bin/ant 10000
246245

247246
# Install Maven
248247
RUN set -ex \
@@ -321,7 +320,7 @@ RUN rbenv install $RUBY_26_VERSION; rm -rf /tmp/*; rbenv global $RUBY_26_VERSION
321320
#**************** END RUBY *****************************************************
322321

323322
#**************** PYTHON *****************************************************
324-
ENV PYTHON_37_VERSION="3.7.6"
323+
ENV PYTHON_37_VERSION="3.7.10"
325324
ENV PYTHON_PIP_VERSION=19.3.1
326325

327326
COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
@@ -391,7 +390,7 @@ RUN set -ex \
391390
&& docker-compose version
392391

393392
#Python 3.8
394-
ENV PYTHON_38_VERSION="3.8.1"
393+
ENV PYTHON_38_VERSION="3.8.8"
395394

396395
COPY tools/runtime_configs/python/$PYTHON_38_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_38_VERSION
397396
RUN env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSION; rm -rf /tmp/*

‎ubuntu/standard/4.0/tools/runtime_configs/python/3.7.7‎ renamed to ‎al2/x86_64/standard/2.0/tools/runtime_configs/python/3.7.10‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ export PYTHON_CONFIGURE_OPTS="\
33
--enable-loadable-sqlite-extensions"
44

55
# Don't change below this line.
6-
# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.7.7
6+
# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.7.10
77

88
#require_gcc
99
prefer_openssl11
1010
export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
1111
install_package "openssl-1.1.0j" "https://www.openssl.org/source/old/1.1.0/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl
1212
install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
1313
if has_tar_xz_support; then
14-
install_package "Python-3.7.7" "https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tar.xz#06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip
14+
install_package "Python-3.7.10" "https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz#f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip
1515
else
16-
install_package "Python-3.7.7" "https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz#8c8be91cd2648a1a0c251f04ea0bb4c2a5570feb9c45eaaa2241c785585b475a" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip
16+
install_package "Python-3.7.10" "https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tgz#c9649ad84dc3a434c8637df6963100b2e5608697f9ba56d82e3809e4148e0975" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip
1717
fi
1818

1919

‎al2/x86_64/standard/2.0/tools/runtime_configs/python/3.7.6‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎al2/x86_64/standard/2.0/tools/runtime_configs/python/3.8.1‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎al2/x86_64/standard/2.0/tools/runtime_configs/python/3.8.8‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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.8
7+
8+
#require_gcc
9+
prefer_openssl11
10+
export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
11+
install_package "openssl-1.1.1i" "https://www.openssl.org/source/old/1.1.1/openssl-1.1.1i.tar.gz#e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" mac_openssl --if has_broken_mac_openssl
12+
install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
13+
if has_tar_xz_support; then
14+
install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tar.xz#7c664249ff77e443d6ea0e4cf0e587eae918ca3c48d081d1915fe2a1f1bcc5cc" ldflags_dirs standard verify_py38 copy_python_gdb ensurepip
15+
else
16+
install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tgz#76c0763f048e4f9b861d24da76b7dd5c7a3ba7ec086f40caedeea359263276f7" ldflags_dirs standard verify_py38 copy_python_gdb ensurepip
17+
fi
18+
19+

‎al2/x86_64/standard/3.0/Dockerfile‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
FROM amazonlinux:2 AS core
1313

14-
ENV EPEL_REPO="https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
15-
1614
# Install git, SSH, and other utilities
1715
RUN set -ex \
1816
&& yum install -y openssh-clients \
@@ -21,7 +19,7 @@ RUN set -ex \
2119
&& ssh-keyscan -t rsa,dsa -H github.com >> ~/.ssh/known_hosts \
2220
&& ssh-keyscan -t rsa,dsa -H bitbucket.org >> ~/.ssh/known_hosts \
2321
&& chmod 600 ~/.ssh/known_hosts \
24-
&& yum install -y $EPEL_REPO \
22+
&& amazon-linux-extras install epel -y \
2523
&& rpm --import https://download.mono-project.com/repo/xamarin.gpg \
2624
&& curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo \
2725
&& amazon-linux-extras enable corretto8 \
@@ -37,7 +35,8 @@ RUN set -ex \
3735
ncurses-devel oniguruma-devel openssl openssl-devel perl-DBD-SQLite \
3836
perl-DBI perl-HTTP-Date perl-IO-Pty-Easy perl-TimeDate perl-YAML-LibYAML \
3937
postgresql-devel procps-ng python-configobj readline-devel rsync sgml-common \
40-
subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel
38+
subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel \
39+
&& rm /etc/yum.repos.d/mono-centos7-stable.repo
4140

4241
RUN useradd codebuild-user
4342

@@ -126,7 +125,7 @@ RUN set -ex \
126125
ENV PATH="/root/.dotnet/:/root/.dotnet/tools/:$PATH"
127126
RUN set -ex \
128127
&& wget -nv -O /usr/local/bin/dotnet-install.sh https://dot.net/v1/dotnet-install.sh \
129-
&& chmod +x /usr/local/bin/dotnet-install.sh
128+
&& chmod +x /usr/local/bin/dotnet-install.sh
130129

131130
##nodejs
132131
ENV N_SRC_DIR="$SRC_DIR/n"
@@ -235,7 +234,7 @@ RUN set -x \
235234
&& echo "$ANT_DOWNLOAD_SHA512 /var/tmp/apache-ant-$ANT_VERSION-bin.tar.gz" | sha512sum -c - \
236235
&& tar -xzf /var/tmp/apache-ant-$ANT_VERSION-bin.tar.gz -C /opt \
237236
&& rm /var/tmp/apache-ant-$ANT_VERSION-bin.tar.gz \
238-
&& update-alternatives --install /usr/bin/ant ant /opt/apache-ant-$ANT_VERSION/bin/ant 10000
237+
&& update-alternatives --install /usr/bin/ant ant /opt/apache-ant-$ANT_VERSION/bin/ant 10000
239238

240239
RUN set -ex \
241240
# Install Maven
@@ -294,7 +293,7 @@ RUN set -ex \
294293

295294
#**************** NODEJS ****************************************************
296295

297-
ENV NODE_10_VERSION="10.21.0"
296+
ENV NODE_10_VERSION="10.23.0"
298297

299298
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 \
300299
&& curl -sSL https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo \
@@ -314,16 +313,16 @@ RUN rbenv install $RUBY_26_VERSION; rm -rf /tmp/*; rbenv global $RUBY_26_VERSION
314313
#**************** END RUBY *****************************************************
315314

316315
#**************** PYTHON *****************************************************
317-
ENV PYTHON_37_VERSION="3.7.7"
318-
ENV PYTHON_PIP_VERSION=19.3.1
316+
ENV PYTHON_37_VERSION="3.7.10"
317+
ENV PYTHON_PIP_VERSION=20.2.4
319318

320319
COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
321320
RUN env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_37_VERSION; rm -rf /tmp/*
322321
RUN pyenv global $PYTHON_37_VERSION
323322
RUN set -ex \
324323
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
325324
&& pip3 install --no-cache-dir --upgrade "PyYAML==5.3.1" \
326-
&& pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv
325+
&& pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
327326

328327
#**************** END PYTHON *****************************************************
329328

@@ -384,18 +383,18 @@ RUN set -ex \
384383
&& docker-compose version
385384

386385
#Python 3.8
387-
ENV PYTHON_38_VERSION="3.8.3"
386+
ENV PYTHON_38_VERSION="3.8.8"
388387

389388
COPY tools/runtime_configs/python/$PYTHON_38_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_38_VERSION
390389
RUN env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSION; rm -rf /tmp/*
391390
RUN pyenv global $PYTHON_38_VERSION
392391
RUN set -ex \
393392
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
394393
&& pip3 install --no-cache-dir --upgrade "PyYAML==5.3.1" \
395-
&& pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv
394+
&& pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
396395

397396
# Node 12
398-
ENV NODE_12_VERSION="12.18.0"
397+
ENV NODE_12_VERSION="12.19.1"
399398

400399
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 \
401400
&& rm -rf /tmp/*
@@ -428,11 +427,11 @@ RUN set -ex \
428427
&& ln -s ~/.dotnet/tools/dotnet-gitversion /usr/local/bin/gitversion
429428

430429
#Ruby 2.7
431-
ENV RUBY_27_VERSION="2.7.1"
430+
ENV RUBY_27_VERSION="2.7.2"
432431
RUN rbenv install $RUBY_27_VERSION; rm -rf /tmp/*; rbenv global $RUBY_27_VERSION;ruby -v
433432

434433
#Golang 14
435-
ENV GOLANG_14_VERSION="1.14.7"
434+
ENV GOLANG_14_VERSION="1.14.12"
436435
RUN goenv install $GOLANG_14_VERSION; rm -rf /tmp/*; \
437436
goenv global $GOLANG_14_VERSION
438437

‎al2/x86_64/standard/3.0/tools/runtime_configs/python/3.7.7‎ renamed to ‎al2/x86_64/standard/3.0/tools/runtime_configs/python/3.7.10‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ export PYTHON_CONFIGURE_OPTS="\
33
--enable-loadable-sqlite-extensions"
44

55
# Don't change below this line.
6-
# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.7.7
6+
# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.7.10
77

88
#require_gcc
99
prefer_openssl11
1010
export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
1111
install_package "openssl-1.1.0j" "https://www.openssl.org/source/old/1.1.0/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl
1212
install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
1313
if has_tar_xz_support; then
14-
install_package "Python-3.7.7" "https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tar.xz#06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip
14+
install_package "Python-3.7.10" "https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz#f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip
1515
else
16-
install_package "Python-3.7.7" "https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz#8c8be91cd2648a1a0c251f04ea0bb4c2a5570feb9c45eaaa2241c785585b475a" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip
16+
install_package "Python-3.7.10" "https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tgz#c9649ad84dc3a434c8637df6963100b2e5608697f9ba56d82e3809e4148e0975" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip
1717
fi
1818

1919

‎al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.3‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.8‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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.8
7+
8+
#require_gcc
9+
prefer_openssl11
10+
export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
11+
install_package "openssl-1.1.1i" "https://www.openssl.org/source/old/1.1.1/openssl-1.1.1i.tar.gz#e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" mac_openssl --if has_broken_mac_openssl
12+
install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
13+
if has_tar_xz_support; then
14+
install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tar.xz#7c664249ff77e443d6ea0e4cf0e587eae918ca3c48d081d1915fe2a1f1bcc5cc" ldflags_dirs standard verify_py38 copy_python_gdb ensurepip
15+
else
16+
install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tgz#76c0763f048e4f9b861d24da76b7dd5c7a3ba7ec086f40caedeea359263276f7" ldflags_dirs standard verify_py38 copy_python_gdb ensurepip
17+
fi
18+
19+

‎ubuntu/standard/3.0/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ RUN rbenv install $RUBY_27_VERSION; rm -rf /tmp/*; rbenv global $RUBY_27_VERSION
233233
#**************** END RUBY *****************************************************
234234

235235
#**************** PYTHON *****************************************************
236-
ENV PYTHON_38_VERSION="3.8.1" \
237-
PYTHON_37_VERSION="3.7.6"
236+
ENV PYTHON_38_VERSION="3.8.8" \
237+
PYTHON_37_VERSION="3.7.10"
238238

239239
ENV PYTHON_PIP_VERSION=19.3.1
240240

0 commit comments

Comments
 (0)