Merge pull request #639 from Dylan-AWS/master

Add al2/x86_64/standard/5.0, update supported images

Author: subinataws

README.md

@@ -38,6 +38,7 @@ The following images are actively maintained by AWS CodeBuild, and are listed in
 + [standard 6.0](ubuntu/standard/6.0)
 + [standard 7.0](ubuntu/standard/7.0)
 + [amazonlinux2-x86_64-standard:4.0](al2/x86_64/standard/4.0)
++ [amazonlinux2-x86_64-standard:5.0](al2/x86_64/standard/5.0)
 + [amazonlinux2-x86_64-standard:corretto8](al2/x86_64/standard/corretto8)
 + [amazonlinux2-x86_64-standard:corretto11](al2/x86_64/standard/corretto11)
 + [amazonlinux2-aarch64-standard:2.0](al2/aarch64/standard/2.0)

al2/x86_64/standard/4.0/Dockerfile

@@ -63,9 +63,9 @@ RUN set -ex \
 
 # Install stunnel
 RUN set -ex \
-   && STUNNEL_VERSION=5.67 \
+   && STUNNEL_VERSION=5.69 \
    && STUNNEL_TAR=stunnel-$STUNNEL_VERSION.tar.gz \
-   && STUNNEL_SHA256="3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456" \
+   && STUNNEL_SHA256="1ff7d9f30884c75b98c8a0a4e1534fa79adcada2322635e6787337b4e38fdb81" \
    && 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 \
@@ -135,15 +135,15 @@ FROM tools AS runtimes_1
 ENV JAVA_17_HOME="/usr/lib/jvm/java-17-amazon-corretto.x86_64" \
     JDK_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 \
+    ANT_VERSION=1.10.13 \
     MAVEN_HOME="/opt/maven" \
-    MAVEN_VERSION=3.8.7 \
+    MAVEN_VERSION=3.9.1 \
     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="21c2be0a180a326353e8f6d12289f74bc7cd53080305f05358936f3a1b6dd4d91203f4cc799e81761cf5c53c5bbe9dcc13bdb27ec8f57ecf21b2f9ceec3c8d27" \
+    ANT_DOWNLOAD_SHA512="de4ac604629e39a86a306f0541adb3775596909ad92feb8b7de759b1b286417db24f557228737c8b902d6abf722d2ce5bb0c3baa3640cbeec3481e15ab1958c9" \
+    MAVEN_DOWNLOAD_SHA512="d3be5956712d1c2cf7a6e4c3a2db1841aa971c6097c7a67f59493a5873ccf8c8b889cf988e4e9801390a2b1ae5a0669de07673acb090a083232dbd3faf82f3e3" \
     GRADLE_DOWNLOADS_SHA256="312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d 7.6" \
     SBT_DOWNLOAD_SHA256="1f65344da074dbd66dfefa93c0eff8d319d772e5cad47fcbeb6ae178bbdf4686" \
     LOG4J_UNSAFE_VERSIONS="2.11.1 1.2.8"
@@ -218,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.8
+ENV POWERSHELL_VERSION 7.2.11
 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 28FF2653667AC63B508F0B98433E48F64E6BC1EC59F8C1D252BA89EB5A7441A2
+ENV POWERSHELL_DOWNLOAD_SHA 9D6F798461D172391B508FCF27F9CBBB4BEF307EBFD6886ED50860C322C7D1B3
 
 RUN set -ex \
     && curl -SL $POWERSHELL_DOWNLOAD_URL --output powershell.tar.gz \
@@ -231,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.405"
+ENV DOTNET_60_SDK_VERSION="6.0.408"
 ENV DOTNET_ROOT="/root/.dotnet"
 
 # Add .NET Core 6.0 Global Tools install folder to PATH
@@ -253,7 +253,7 @@ RUN set -ex \
 
 #****************      NODEJS     ****************************************************
 
-ENV NODE_16_VERSION="16.19.0"
+ENV NODE_16_VERSION="16.20.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 \
@@ -267,7 +267,7 @@ RUN  n $NODE_16_VERSION && npm install --save-dev -g -f grunt && npm install --s
 
 #**************** RUBY *********************************************************
 
-ENV RUBY_31_VERSION="3.1.3"
+ENV RUBY_31_VERSION="3.1.4"
 
 RUN rbenv install $RUBY_31_VERSION && rm -rf /tmp/* && rbenv global $RUBY_31_VERSION && ruby -v
 
@@ -276,7 +276,7 @@ RUN rbenv install $RUBY_31_VERSION && rm -rf /tmp/* && rbenv global $RUBY_31_VER
 #**************** PYTHON *****************************************************
 #Python 3.9
 ENV PYTHON_39_VERSION="3.9.16"
-ENV PYTHON_PIP_VERSION=21.1.2
+ENV PYTHON_PIP_VERSION=21.3.1
 ENV PYYAML_VERSION=5.4.1
 
 COPY tools/runtime_configs/python/$PYTHON_39_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_39_VERSION
@@ -285,12 +285,12 @@ RUN   pyenv global  $PYTHON_39_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
     && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
-    && pip3 install --no-cache-dir --upgrade 'setuptools==57.4.0' wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver    
+    && pip3 install --no-cache-dir --upgrade 'setuptools==57.5.0' wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
 
 #**************** END PYTHON *****************************************************
 
 #****************      PHP     ****************************************************
-ENV PHP_81_VERSION="8.1.13"
+ENV PHP_81_VERSION="8.1.18"
 
 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
@@ -301,7 +301,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin -
 #****************      END PHP     ****************************************************
 
 #****************     GOLANG     ****************************************************
-ENV GOLANG_18_VERSION="1.18.9"
+ENV GOLANG_18_VERSION="1.18.10"
 ENV GOENV_DISABLE_GOPATH=1
 ENV GOPATH="/go"
 
@@ -319,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.2"
+    DOCKER_COMPOSE_VERSION="1.29.2"
 
-ENV DOCKER_SHA256="945C3A3DDCB79EE7307496C2F39EB3D8372466E8654E63D60BBB462E4A3C1427"
-ENV DOCKER_VERSION="20.10.22"
+ENV DOCKER_SHA256="AB91092320A87691A1EAF0225B48585DB9C69CFF0ED4B0F569F744FF765515E3"
+ENV DOCKER_VERSION="20.10.24"
 
 VOLUME /var/lib/docker
 

ubuntu/standard/5.0/tools/runtime_configs/php/8.0.26 renamed to al2/x86_64/standard/4.0/tools/runtime_configs/php/8.1.18

@@ -5,7 +5,7 @@ configure_option "--with-libedit"
 
 PHP_BUILD_EXTRA_MAKE_ARGUMENTS="-j4"
 
-#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/8.0.26
+#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/8.1.18
 #Don't change beyond this line
 
 configure_option "--enable-gd"
@@ -15,6 +15,6 @@ configure_option "--with-mhash"
 
 configure_option -D "--with-xmlrpc"
 
-install_package "https://secure.php.net/distributions/php-8.0.26.tar.bz2"
-install_xdebug "3.1.3"
-enable_builtin_opcache
+install_package "https://www.php.net/distributions/php-8.1.18.tar.bz2"
+install_xdebug "3.2.0"
+enable_builtin_opcache