Merge pull request aws#600 from Dylan-AWS/master

Update runtime versions for ubuntu and amazonlinux2 x86 images

al2/x86_64/standard/3.0/Dockerfile

@@ -96,9 +96,9 @@ RUN set -ex \
 
 # Install stunnel
 RUN set -ex \
-   && STUNNEL_VERSION=5.64 \
+   && STUNNEL_VERSION=5.67 \
    && STUNNEL_TAR=stunnel-$STUNNEL_VERSION.tar.gz \
-   && STUNNEL_SHA256="eebe53ed116ba43b2e786762b0c2b91511e7b74857ad4765824e7199e6faf883" \
+   && STUNNEL_SHA256="3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456" \
    && 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 \
    && cd stunnel-$STUNNEL_VERSION \
    && ./configure \
@@ -284,9 +284,9 @@ RUN rm -fr /tmp/* /var/tmp/*
 
 # Install Powershell Core
 # See instructions at https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-powershell-core-on-linux
-ENV POWERSHELL_VERSION 6.2.6
+ENV POWERSHELL_VERSION 6.2.7
 ENV POWERSHELL_DOWNLOAD_URL https://github.com/PowerShell/PowerShell/releases/download/v$POWERSHELL_VERSION/powershell-$POWERSHELL_VERSION-linux-x64.tar.gz
-ENV POWERSHELL_DOWNLOAD_SHA ee5512d869ab9bd59bf17f417ff93013e0a169db91cf848ba2570d4818e05e17
+ENV POWERSHELL_DOWNLOAD_SHA 6073852FB8373FD3037FAE00793AECF5CCC1D3C6F4F18CCF0A85A433617ABC17
 
 RUN set -ex \
     && curl -SL $POWERSHELL_DOWNLOAD_URL --output powershell.tar.gz \
@@ -368,10 +368,10 @@ FROM runtimes_1 AS runtimes_2
 ENV DOCKER_BUCKET="download.docker.com" \
     DOCKER_CHANNEL="stable" \
     DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \
-    DOCKER_COMPOSE_VERSION="1.26.0"
+    DOCKER_COMPOSE_VERSION="1.26.2"
 
-ENV DOCKER_SHA256="9ccfc39305ae1d8882d18c9c431544fca82913d6df717409ac2244ac58c4f070"
-ENV DOCKER_VERSION="20.10.15"
+ENV DOCKER_SHA256="945C3A3DDCB79EE7307496C2F39EB3D8372466E8654E63D60BBB462E4A3C1427"
+ENV DOCKER_VERSION="20.10.22"
 
 VOLUME /var/lib/docker
 
@@ -403,7 +403,7 @@ RUN set -ex \
     && pip3 install --no-cache-dir --upgrade 'setuptools==57.4.0' wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
 
 #Python 3.9
-ENV PYTHON_39_VERSION="3.9.12"
+ENV PYTHON_39_VERSION="3.9.16"
 
 COPY tools/runtime_configs/python/$PYTHON_39_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_39_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_39_VERSION && rm -rf /tmp/*
@@ -423,7 +423,7 @@ RUN  n $NODE_12_VERSION && npm install --save-dev -g -f grunt && npm install --s
 FROM runtimes_2 AS runtimes_3
 
 #DotNet 3.1
-ENV DOTNET_31_SDK_VERSION="3.1.419"
+ENV DOTNET_31_SDK_VERSION="3.1.426"
 ENV DOTNET_ROOT="/root/.dotnet"
 
 # Add .NET Core 3.1 Global Tools install folder to PATH
@@ -448,15 +448,15 @@ RUN set -ex \
     && ln -s ~/.dotnet/tools/dotnet-gitversion /usr/local/bin/gitversion
 
 #Ruby 2.7
-ENV RUBY_27_VERSION="2.7.6"
+ENV RUBY_27_VERSION="2.7.7"
 RUN rbenv install $RUBY_27_VERSION && rm -rf /tmp/* && rbenv global $RUBY_27_VERSION && ruby -v
 
 #Golang 14
 ENV GOLANG_14_VERSION="1.14.15"
 RUN goenv install $GOLANG_14_VERSION && rm -rf /tmp/* && goenv global  $GOLANG_14_VERSION
 
 #Php 7.4
-ENV PHP_74_VERSION="7.4.29"
+ENV PHP_74_VERSION="7.4.33"
 COPY tools/runtime_configs/php/$PHP_74_VERSION /root/.phpenv/plugins/php-build/share/php-build/definitions/$PHP_74_VERSION
 RUN phpenv install $PHP_74_VERSION && rm -rf /tmp/* && phpenv global $PHP_74_VERSION
 RUN echo "memory_limit = 1G;" >> "/root/.phpenv/versions/$PHP_74_VERSION/etc/conf.d/memory.ini"

ubuntu/standard/4.0/tools/runtime_configs/php/7.4.29 → al2/x86_64/standard/3.0/tools/runtime_configs/php/7.4.33

@@ -5,14 +5,13 @@ configure_option "--with-libedit"
 
 PHP_BUILD_EXTRA_MAKE_ARGUMENTS="-j4"
 
-#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/7.4.29
+#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/7.4.33
 #Don't change beyond this line
 
 configure_option "--enable-gd"
 configure_option "--with-jpeg"
 configure_option "--with-zip"
 
-install_package "https://secure.php.net/distributions/php-7.4.29.tar.bz2"
+install_package "https://secure.php.net/distributions/php-7.4.33.tar.bz2"
 install_xdebug "3.1.3"
 enable_builtin_opcache
-

al2/x86_64/standard/4.0/tools/runtime_configs/python/3.8.13 → al2/x86_64/standard/3.0/tools/runtime_configs/python/3.9.16

@@ -3,15 +3,15 @@ export PYTHON_CONFIGURE_OPTS="\
             --enable-loadable-sqlite-extensions"
 
 # Don't change below this line.
-# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.13
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.9.16
 
 #require_gcc
 prefer_openssl11
 export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
 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
 install_package "readline-8.1" "https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz#f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
-  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
+  install_package "Python-3.9.16" "https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tar.xz#22dddc099246dd2760665561e8adb7394ea0cc43a72684c6480f9380f7786439" standard verify_py39 copy_python_gdb ensurepip
 else
-  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
+  install_package "Python-3.9.16" "https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tgz#1ad539e9dbd2b42df714b69726e0693bc6b9d2d2c8e91c2e43204026605140c5" standard verify_py39 copy_python_gdb ensurepip
 fi

al2/x86_64/standard/4.0/Dockerfile

@@ -39,7 +39,7 @@ RUN set -ex \
            perl-DBI perl-HTTP-Date perl-IO-Pty-Easy perl-TimeDate perl-YAML-LibYAML \
            postgresql-devel procps-ng python-configobj readline-devel rsync sgml-common \
            subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel \
-           amazon-ecr-credential-helper java-17-amazon-corretto-devel \
+           amazon-ecr-credential-helper \
     && rm /etc/yum.repos.d/mono-centos7-stable.repo
 
 RUN useradd codebuild-user
@@ -50,7 +50,7 @@ FROM core AS tools
 
 # Install Git
 RUN set -ex \
-   && GIT_VERSION=2.36.1 \
+   && GIT_VERSION=2.39.1 \
    && GIT_TAR_FILE=git-$GIT_VERSION.tar.gz \
    && GIT_SRC=https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz  \
    && curl -L -o $GIT_TAR_FILE $GIT_SRC \
@@ -63,9 +63,9 @@ RUN set -ex \
 
 # Install stunnel
 RUN set -ex \
-   && STUNNEL_VERSION=5.64 \
+   && STUNNEL_VERSION=5.67 \
    && STUNNEL_TAR=stunnel-$STUNNEL_VERSION.tar.gz \
-   && STUNNEL_SHA256="eebe53ed116ba43b2e786762b0c2b91511e7b74857ad4765824e7199e6faf883" \
+   && STUNNEL_SHA256="3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456" \
    && 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 \
    && cd stunnel-$STUNNEL_VERSION \
    && ./configure \
@@ -137,15 +137,15 @@ ENV JAVA_17_HOME="/usr/lib/jvm/java-17-amazon-corretto.x86_64" \
     JRE_17_HOME="/usr/lib/jvm/java-17-amazon-corretto.x86_64" \
     ANT_VERSION=1.10.12 \
     MAVEN_HOME="/opt/maven" \
-    MAVEN_VERSION=3.8.6 \
-    INSTALLED_GRADLE_VERSIONS="7.4.2" \
-    GRADLE_VERSION=7.4.2 \
-    SBT_VERSION=1.6.2 \
+    MAVEN_VERSION=3.8.7 \
+    INSTALLED_GRADLE_VERSIONS="7.6" \
+    GRADLE_VERSION=7.6 \
+    SBT_VERSION=1.8.2 \
     GRADLE_PATH="$SRC_DIR/gradle" \
     ANT_DOWNLOAD_SHA512="2287dc5cfc21043c14e5413f9afb1c87c9f266ec2a9ba2d3bf2285446f6e4ccb59b558bf2e5c57911a05dfa293c7d5c7ad60ac9f744ba11406f4e6f9a27b2403" \
-    MAVEN_DOWNLOAD_SHA512="f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26" \
-    GRADLE_DOWNLOADS_SHA256="e6d864e3b5bc05cc62041842b306383fc1fefcec359e70cebb1d470a6094ca82 7.4.2" \
-    SBT_DOWNLOAD_SHA256="637637b6c4e6fa04ab62cd364061e32b12480b09001cd23303df62b36fadd440" \
+    MAVEN_DOWNLOAD_SHA512="21c2be0a180a326353e8f6d12289f74bc7cd53080305f05358936f3a1b6dd4d91203f4cc799e81761cf5c53c5bbe9dcc13bdb27ec8f57ecf21b2f9ceec3c8d27" \
+    GRADLE_DOWNLOADS_SHA256="312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d 7.6" \
+    SBT_DOWNLOAD_SHA256="1f65344da074dbd66dfefa93c0eff8d319d772e5cad47fcbeb6ae178bbdf4686" \
     LOG4J_UNSAFE_VERSIONS="2.11.1 1.2.8"
 
 ARG MAVEN_CONFIG_HOME="/root/.m2"
@@ -155,7 +155,9 @@ ENV JAVA_HOME="$JAVA_17_HOME" \
 
 RUN set -x \
     # Install Amazon Corretto 17
-    && yum install -y -q java-17-amazon-corretto \
+    && rpm --import https://yum.corretto.aws/corretto.key \
+    && curl -L -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \
+    && yum install -y -q java-17-amazon-corretto java-17-amazon-corretto-devel \
     && update-ca-trust \
     && for tool_path in $JAVA_HOME/bin/*; do \
           tool=`basename $tool_path`; \
@@ -216,9 +218,9 @@ RUN rm -fr /tmp/* /var/tmp/*
 
 # Install Powershell Core
 # See instructions at https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-powershell-core-on-linux
-ENV POWERSHELL_VERSION 7.2.4
+ENV POWERSHELL_VERSION 7.2.8
 ENV POWERSHELL_DOWNLOAD_URL https://github.com/PowerShell/PowerShell/releases/download/v$POWERSHELL_VERSION/powershell-$POWERSHELL_VERSION-linux-x64.tar.gz
-ENV POWERSHELL_DOWNLOAD_SHA 935B874A2E5F5662AB23EFBE7392DC96C27D4FD064041D28A25A487EC5F6CC2E
+ENV POWERSHELL_DOWNLOAD_SHA 28FF2653667AC63B508F0B98433E48F64E6BC1EC59F8C1D252BA89EB5A7441A2
 
 RUN set -ex \
     && curl -SL $POWERSHELL_DOWNLOAD_URL --output powershell.tar.gz \
@@ -229,7 +231,7 @@ RUN set -ex \
     && ln -s /opt/microsoft/powershell/$POWERSHELL_VERSION/pwsh /usr/bin/pwsh
 
 #DotNet 6.0
-ENV DOTNET_60_SDK_VERSION="6.0.301"
+ENV DOTNET_60_SDK_VERSION="6.0.405"
 ENV DOTNET_ROOT="/root/.dotnet"
 
 # Add .NET Core 6.0 Global Tools install folder to PATH
@@ -251,7 +253,7 @@ RUN set -ex \
 
 #****************      NODEJS     ****************************************************
 
-ENV NODE_16_VERSION="16.15.1"
+ENV NODE_16_VERSION="16.19.0"
 
 RUN  n $NODE_16_VERSION && npm install --save-dev -g -f grunt && npm install --save-dev -g -f grunt-cli && npm install --save-dev -g -f webpack \
      && curl -sSL https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo \
@@ -265,15 +267,15 @@ RUN  n $NODE_16_VERSION && npm install --save-dev -g -f grunt && npm install --s
 
 #**************** RUBY *********************************************************
 
-ENV RUBY_31_VERSION="3.1.2"
+ENV RUBY_31_VERSION="3.1.3"
 
 RUN rbenv install $RUBY_31_VERSION && rm -rf /tmp/* && rbenv global $RUBY_31_VERSION && ruby -v
 
 #**************** END RUBY *****************************************************
 
 #**************** PYTHON *****************************************************
 #Python 3.9
-ENV PYTHON_39_VERSION="3.9.12"
+ENV PYTHON_39_VERSION="3.9.16"
 ENV PYTHON_PIP_VERSION=21.1.2
 ENV PYYAML_VERSION=5.4.1
 
@@ -288,7 +290,7 @@ RUN set -ex \
 #**************** END PYTHON *****************************************************
 
 #****************      PHP     ****************************************************
-ENV PHP_81_VERSION="8.1.6"
+ENV PHP_81_VERSION="8.1.13"
 
 COPY tools/runtime_configs/php/$PHP_81_VERSION /root/.phpenv/plugins/php-build/share/php-build/definitions/$PHP_81_VERSION
 RUN phpenv install $PHP_81_VERSION && rm -rf /tmp/* && phpenv global $PHP_81_VERSION
@@ -299,7 +301,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin -
 #****************      END PHP     ****************************************************
 
 #****************     GOLANG     ****************************************************
-ENV GOLANG_18_VERSION="1.18.8"
+ENV GOLANG_18_VERSION="1.18.9"
 ENV GOENV_DISABLE_GOPATH=1
 ENV GOPATH="/go"
 
@@ -317,10 +319,10 @@ FROM runtimes_1 AS runtimes_2
 ENV DOCKER_BUCKET="download.docker.com" \
     DOCKER_CHANNEL="stable" \
     DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \
-    DOCKER_COMPOSE_VERSION="1.26.0"
+    DOCKER_COMPOSE_VERSION="1.26.2"
 
-ENV DOCKER_SHA256="9ccfc39305ae1d8882d18c9c431544fca82913d6df717409ac2244ac58c4f070"
-ENV DOCKER_VERSION="20.10.15"
+ENV DOCKER_SHA256="945C3A3DDCB79EE7307496C2F39EB3D8372466E8654E63D60BBB462E4A3C1427"
+ENV DOCKER_VERSION="20.10.22"
 
 VOLUME /var/lib/docker
 
@@ -345,13 +347,13 @@ RUN set -ex \
 FROM runtimes_2 AS runtimes_3
 
 # Install GitVersion
-ENV GITVERSION_VERSION="5.3.5"
+ENV GITVERSION_VERSION="5.11.1"
 RUN set -ex \
     && dotnet tool install --global GitVersion.Tool --version $GITVERSION_VERSION \
     && ln -s ~/.dotnet/tools/dotnet-gitversion /usr/local/bin/gitversion
 
 #===================END of runtimes_3 ==============
-FROM runtimes_3 AS al2_v3
+FROM runtimes_3 AS al2_v4
 
 # Configure SSH
 COPY ssh_config /root/.ssh/config

ubuntu/standard/5.0/tools/runtime_configs/php/7.4.29 → al2/x86_64/standard/4.0/tools/runtime_configs/php/8.1.13

@@ -5,14 +5,13 @@ configure_option "--with-libedit"
 
 PHP_BUILD_EXTRA_MAKE_ARGUMENTS="-j4"
 
-#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/7.4.29
+#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/8.1.13
 #Don't change beyond this line
 
 configure_option "--enable-gd"
 configure_option "--with-jpeg"
 configure_option "--with-zip"
 
-install_package "https://secure.php.net/distributions/php-7.4.29.tar.bz2"
+install_package "https://secure.php.net/distributions/php-8.1.13.tar.bz2"
 install_xdebug "3.1.3"
 enable_builtin_opcache
-

al2/x86_64/standard/3.0/tools/runtime_configs/python/3.9.12 → al2/x86_64/standard/4.0/tools/runtime_configs/python/3.9.16

@@ -3,15 +3,15 @@ export PYTHON_CONFIGURE_OPTS="\
             --enable-loadable-sqlite-extensions"
 
 # Don't change below this line.
-# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.9.12
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.9.16
 
 #require_gcc
 prefer_openssl11
 export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
 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
 install_package "readline-8.1" "https://ftpmirror.gnu.org/readline/readline-8.1.tar.gz#f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
-  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
+  install_package "Python-3.9.16" "https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tar.xz#22dddc099246dd2760665561e8adb7394ea0cc43a72684c6480f9380f7786439" standard verify_py39 copy_python_gdb ensurepip
 else
-  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
+  install_package "Python-3.9.16" "https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tgz#1ad539e9dbd2b42df714b69726e0693bc6b9d2d2c8e91c2e43204026605140c5" standard verify_py39 copy_python_gdb ensurepip
 fi