diff --git a/al2/x86_64/standard/4.0/Dockerfile b/al2/x86_64/standard/4.0/Dockerfile index 5c998eaa..77f43a74 100644 --- a/al2/x86_64/standard/4.0/Dockerfile +++ b/al2/x86_64/standard/4.0/Dockerfile @@ -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.13 \ MAVEN_HOME="/opt/maven" \ - MAVEN_VERSION=3.9.1 \ - INSTALLED_GRADLE_VERSIONS="7.6" \ - GRADLE_VERSION=7.6 \ - SBT_VERSION=1.8.2 \ + MAVEN_VERSION=3.9.2 \ + INSTALLED_GRADLE_VERSIONS="7.6.1" \ + GRADLE_VERSION=7.6.1 \ + SBT_VERSION=1.8.3 \ GRADLE_PATH="$SRC_DIR/gradle" \ ANT_DOWNLOAD_SHA512="de4ac604629e39a86a306f0541adb3775596909ad92feb8b7de759b1b286417db24f557228737c8b902d6abf722d2ce5bb0c3baa3640cbeec3481e15ab1958c9" \ - MAVEN_DOWNLOAD_SHA512="d3be5956712d1c2cf7a6e4c3a2db1841aa971c6097c7a67f59493a5873ccf8c8b889cf988e4e9801390a2b1ae5a0669de07673acb090a083232dbd3faf82f3e3" \ - GRADLE_DOWNLOADS_SHA256="312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d 7.6" \ - SBT_DOWNLOAD_SHA256="1f65344da074dbd66dfefa93c0eff8d319d772e5cad47fcbeb6ae178bbdf4686" \ + MAVEN_DOWNLOAD_SHA512="900bdeeeae550d2d2b3920fe0e00e41b0069f32c019d566465015bdd1b3866395cbe016e22d95d25d51d3a5e614af2c83ec9b282d73309f644859bbad08b63db" \ + GRADLE_DOWNLOADS_SHA256="518a863631feb7452b8f1b3dc2aaee5f388355cc3421bbd0275fbeadd77e84b2 7.6.1" \ + SBT_DOWNLOAD_SHA256="21F4210786FD68FD15DCA3F4C8EE9CAE0DB249C54E1B0EF6E829E9FA4936423A" \ LOG4J_UNSAFE_VERSIONS="2.11.1 1.2.8" ARG MAVEN_CONFIG_HOME="/root/.m2" @@ -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.408" +ENV DOTNET_60_SDK_VERSION="6.0.410" ENV DOTNET_ROOT="/root/.dotnet" # Add .NET Core 6.0 Global Tools install folder to PATH @@ -253,12 +253,12 @@ RUN set -ex \ #**************** NODEJS **************************************************** -ENV NODE_16_VERSION="16.20.0" +ENV NODE_16_VERSION="16.20.1" 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 \ && rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg \ - && 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 \ + && yum install -y https://dl.fedoraproject.org/pub/epel/8/Modular/x86_64/Packages/l/libuv-1.43.0-2.module_el8+13804+34326f90.x86_64.rpm \ && yum install -y -q yarn \ && yarn --version \ && cd / && rm -rf $N_SRC_DIR && rm -rf /tmp/* @@ -275,7 +275,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_39_VERSION="3.9.17" ENV PYTHON_PIP_VERSION=21.3.1 ENV PYYAML_VERSION=5.4.1 @@ -290,7 +290,7 @@ RUN set -ex \ #**************** END PYTHON ***************************************************** #**************** PHP **************************************************** -ENV PHP_81_VERSION="8.1.18" +ENV PHP_81_VERSION="8.1.20" 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 diff --git a/al2/x86_64/standard/4.0/tools/runtime_configs/php/8.1.18 b/al2/x86_64/standard/4.0/tools/runtime_configs/php/8.1.20 similarity index 84% rename from al2/x86_64/standard/4.0/tools/runtime_configs/php/8.1.18 rename to al2/x86_64/standard/4.0/tools/runtime_configs/php/8.1.20 index 142b51c8..f890e28c 100644 --- a/al2/x86_64/standard/4.0/tools/runtime_configs/php/8.1.18 +++ b/al2/x86_64/standard/4.0/tools/runtime_configs/php/8.1.20 @@ -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.1.18 +#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/8.1.20 #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://www.php.net/distributions/php-8.1.18.tar.bz2" +install_package "https://www.php.net/distributions/php-8.1.20.tar.bz2" install_xdebug "3.2.0" enable_builtin_opcache \ No newline at end of file diff --git a/al2/x86_64/standard/4.0/tools/runtime_configs/python/3.9.16 b/al2/x86_64/standard/4.0/tools/runtime_configs/python/3.9.16 deleted file mode 100644 index 24dea054..00000000 --- a/al2/x86_64/standard/4.0/tools/runtime_configs/python/3.9.16 +++ /dev/null @@ -1,17 +0,0 @@ -export PYTHON_CONFIGURE_OPTS="\ - --enable-shared - --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.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.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.16" "https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tgz#1ad539e9dbd2b42df714b69726e0693bc6b9d2d2c8e91c2e43204026605140c5" standard verify_py39 copy_python_gdb ensurepip -fi diff --git a/al2/x86_64/standard/4.0/tools/runtime_configs/python/3.9.17 b/al2/x86_64/standard/4.0/tools/runtime_configs/python/3.9.17 new file mode 100644 index 00000000..b32c9af7 --- /dev/null +++ b/al2/x86_64/standard/4.0/tools/runtime_configs/python/3.9.17 @@ -0,0 +1,20 @@ +export PYTHON_CONFIGURE_OPTS="\ + --enable-shared + --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.17 + +#require_gcc +prefer_openssl11 +export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 +# Avoid a compilation error when linking against OpenSSL built with SSLv3 support (fixed in 3.10.0) (#2181) +export PYTHON_CFLAGS="-DOPENSSL_NO_SSL3${PYTHON_CFLAGS:+ $PYTHON_CFLAGS}" + +install_package "openssl-1.1.1u" "https://www.openssl.org/source/openssl-1.1.1u.tar.gz#e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6" 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.17" "https://www.python.org/ftp/python/3.9.17/Python-3.9.17.tar.xz#30ce057c44f283f8ed93606ccbdb8d51dd526bdc4c62cce5e0dc217bfa3e8cee" standard verify_py39 copy_python_gdb ensurepip +else + install_package "Python-3.9.17" "https://www.python.org/ftp/python/3.9.17/Python-3.9.17.tgz#8ead58f669f7e19d777c3556b62fae29a81d7f06a7122ff9bc57f7dd82d7e014" standard verify_py39 copy_python_gdb ensurepip +fi \ No newline at end of file diff --git a/al2/x86_64/standard/5.0/Dockerfile b/al2/x86_64/standard/5.0/Dockerfile index 080cc156..a4e5ee0f 100644 --- a/al2/x86_64/standard/5.0/Dockerfile +++ b/al2/x86_64/standard/5.0/Dockerfile @@ -47,7 +47,7 @@ FROM core AS tools # Install Git RUN set -ex \ - && GIT_VERSION=2.40.0 \ + && GIT_VERSION=2.40.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 \ @@ -134,14 +134,14 @@ 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.13 \ MAVEN_HOME="/opt/maven" \ - MAVEN_VERSION=3.9.1 \ + MAVEN_VERSION=3.9.2 \ GRADLE_VERSION=8.1.1 \ - SBT_VERSION=1.8.2 \ + SBT_VERSION=1.8.3 \ GRADLE_PATH="$SRC_DIR/gradle" \ ANT_DOWNLOAD_SHA512="de4ac604629e39a86a306f0541adb3775596909ad92feb8b7de759b1b286417db24f557228737c8b902d6abf722d2ce5bb0c3baa3640cbeec3481e15ab1958c9" \ - MAVEN_DOWNLOAD_SHA512="d3be5956712d1c2cf7a6e4c3a2db1841aa971c6097c7a67f59493a5873ccf8c8b889cf988e4e9801390a2b1ae5a0669de07673acb090a083232dbd3faf82f3e3" \ + MAVEN_DOWNLOAD_SHA512="900bdeeeae550d2d2b3920fe0e00e41b0069f32c019d566465015bdd1b3866395cbe016e22d95d25d51d3a5e614af2c83ec9b282d73309f644859bbad08b63db" \ GRADLE_DOWNLOADS_SHA256="5625a0ae20fe000d9225d000b36909c7a0e0e8dda61c19b12da769add847c975 8.1.1" \ - SBT_DOWNLOAD_SHA256="1f65344da074dbd66dfefa93c0eff8d319d772e5cad47fcbeb6ae178bbdf4686" + SBT_DOWNLOAD_SHA256="21F4210786FD68FD15DCA3F4C8EE9CAE0DB249C54E1B0EF6E829E9FA4936423A" ARG MAVEN_CONFIG_HOME="/root/.m2" ENV JAVA_HOME="$JAVA_17_HOME" \ @@ -231,7 +231,7 @@ RUN curl https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o /tmp/awscli && aws --version #DotNet 6.0 -ENV DOTNET_60_SDK_VERSION="6.0.408" +ENV DOTNET_60_SDK_VERSION="6.0.410" ENV DOTNET_ROOT="/root/.dotnet" # Add .NET Core 6.0 Global Tools install folder to PATH @@ -256,6 +256,11 @@ RUN set -ex \ ENV NODE_18_VERSION="18.16.0" RUN n $NODE_18_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 \ + && rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg \ + && yum install -y https://dl.fedoraproject.org/pub/epel/8/Modular/x86_64/Packages/l/libuv-1.43.0-2.module_el8+13804+34326f90.x86_64.rpm \ + && yum install -y -q yarn \ + && yarn --version \ && cd / && rm -rf $N_SRC_DIR && rm -rf /tmp/* #**************** END NODEJS **************************************************** @@ -270,8 +275,8 @@ RUN rbenv install $RUBY_32_VERSION && rm -rf /tmp/* && rbenv global $RUBY_32_VER #**************** PYTHON ***************************************************** #Python 3.11 -ENV PYTHON_311_VERSION="3.11.2" -ENV PYTHON_PIP_VERSION=23.1.1 +ENV PYTHON_311_VERSION="3.11.4" +ENV PYTHON_PIP_VERSION=23.1.2 ENV PYYAML_VERSION=6.0 COPY tools/runtime_configs/python/$PYTHON_311_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_311_VERSION @@ -285,7 +290,7 @@ RUN set -ex \ #**************** END PYTHON ***************************************************** #**************** PHP **************************************************** -ENV PHP_82_VERSION="8.2.5" +ENV PHP_82_VERSION="8.2.7" COPY tools/runtime_configs/php/$PHP_82_VERSION /root/.phpenv/plugins/php-build/share/php-build/definitions/$PHP_82_VERSION RUN phpenv install $PHP_82_VERSION && rm -rf /tmp/* && phpenv global $PHP_82_VERSION @@ -296,7 +301,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin - #**************** END PHP **************************************************** #**************** GOLANG **************************************************** -ENV GOLANG_20_VERSION="1.20.3" +ENV GOLANG_20_VERSION="1.20.5" ENV GOENV_DISABLE_GOPATH=1 ENV GOPATH="/go" @@ -315,10 +320,10 @@ ENV DOCKER_BUCKET="download.docker.com" \ DOCKER_CHANNEL="stable" \ DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \ DOCKER_COMPOSE_VERSION="2.17.3" \ - DOCKER_BUILDX_VERSION="0.10.4" + DOCKER_BUILDX_VERSION="0.11.0" -ENV DOCKER_SHA256="81BD643A32B3428F6D9EAFBD9331D0DA1577C958C1C2702DB1EFF7AFA1CDF3CD" -ENV DOCKER_VERSION="23.0.4" +ENV DOCKER_SHA256="544262F4A3621222AFB79960BFAD4D486935DAB80893478B5CC9CF8EBAF409AE" +ENV DOCKER_VERSION="23.0.6" VOLUME /var/lib/docker @@ -342,11 +347,13 @@ RUN set -ex \ # Ensure docker-compose and docker compose work && docker-compose version \ && docker compose version \ - # Add docker buildx tool - && curl -L https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o /usr/local/bin/docker-buildx \ - && chmod +x /usr/local/bin/dind /usr/local/bin/docker-buildx \ + # Add docker buildx tool \ + && curl -L https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o /usr/local/lib/docker/cli-plugins/docker-buildx \ + && chmod +x /usr/local/bin/dind /usr/local/lib/docker/cli-plugins/docker-buildx \ + && ln -s /usr/local/lib/docker/cli-plugins/docker-buildx /usr/local/bin/docker-buildx \ # Ensure docker-buildx works - && docker-buildx version + && docker-buildx version \ + && docker buildx version #=======================End of layer: runtimes_2 ================= FROM runtimes_2 AS runtimes_3 diff --git a/ubuntu/standard/7.0/tools/runtime_configs/php/8.2.5 b/al2/x86_64/standard/5.0/tools/runtime_configs/php/8.2.7 similarity index 85% rename from ubuntu/standard/7.0/tools/runtime_configs/php/8.2.5 rename to al2/x86_64/standard/5.0/tools/runtime_configs/php/8.2.7 index 1f7eb4a7..352b6d5b 100644 --- a/ubuntu/standard/7.0/tools/runtime_configs/php/8.2.5 +++ b/al2/x86_64/standard/5.0/tools/runtime_configs/php/8.2.7 @@ -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.2.5 +#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/8.2.7 #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://www.php.net/distributions/php-8.2.5.tar.bz2" +install_package "https://www.php.net/distributions/php-8.2.7.tar.bz2" install_xdebug "3.2.0" enable_builtin_opcache \ No newline at end of file diff --git a/ubuntu/standard/7.0/tools/runtime_configs/python/3.11.2 b/al2/x86_64/standard/5.0/tools/runtime_configs/python/3.11.4 similarity index 64% rename from ubuntu/standard/7.0/tools/runtime_configs/python/3.11.2 rename to al2/x86_64/standard/5.0/tools/runtime_configs/python/3.11.4 index deca3b63..b028ae5d 100644 --- a/ubuntu/standard/7.0/tools/runtime_configs/python/3.11.2 +++ b/al2/x86_64/standard/5.0/tools/runtime_configs/python/3.11.4 @@ -3,16 +3,16 @@ 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.11.2 +# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.11.4 -# require_gcc +#require_gcc prefer_openssl11 export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1 install_package "openssl-1.1.1s" "https://www.openssl.org/source/openssl-1.1.1s.tar.gz#c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa" mac_openssl --if has_broken_mac_openssl install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline if has_tar_xz_support; then - install_package "Python-3.11.2" "https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tar.xz#29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af" standard verify_py311 copy_python_gdb ensurepip + install_package "Python-3.11.4" "https://www.python.org/ftp/python/3.11.4/Python-3.11.4.tar.xz#2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6" standard verify_py311 copy_python_gdb ensurepip else - install_package "Python-3.11.2" "https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tgz#2411c74bda5bbcfcddaf4531f66d1adc73f247f529aee981b029513aefdbf849" standard verify_py311 copy_python_gdb ensurepip + install_package "Python-3.11.4" "https://www.python.org/ftp/python/3.11.4/Python-3.11.4.tgz#85c37a265e5c9dd9f75b35f954e31fbfc10383162417285e30ad25cc073a0d63" standard verify_py311 copy_python_gdb ensurepip fi \ No newline at end of file diff --git a/al2/x86_64/standard/corretto11/Dockerfile b/al2/x86_64/standard/corretto11/Dockerfile index b6c833d1..e61687d8 100644 --- a/al2/x86_64/standard/corretto11/Dockerfile +++ b/al2/x86_64/standard/corretto11/Dockerfile @@ -21,7 +21,8 @@ RUN set -ex \ && touch ~/.ssh/known_hosts \ && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H github.com >> ~/.ssh/known_hosts \ && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H bitbucket.org >> ~/.ssh/known_hosts \ - && chmod 600 ~/.ssh/known_hosts + && chmod 600 ~/.ssh/known_hosts \ + && yum install -y -q make gettext-devel gcc openssl-devel curl-devel expat-devel RUN useradd codebuild-user @@ -54,6 +55,59 @@ RUN set -ex \ && ln -s /usr/local/gradle-$GRADLE_VERSION/bin/gradle /usr/bin/gradle \ && rm -rf $GRADLE_PATH +# Install Git +RUN set -ex \ + && GIT_VERSION=2.41.0 \ + && 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 \ + && tar zxf $GIT_TAR_FILE \ + && cd git-$GIT_VERSION \ + && make -j4 prefix=/usr \ + && make install prefix=/usr \ + && cd .. && rm -rf git-$GIT_VERSION \ + && rm -rf $GIT_TAR_FILE /tmp/* + +#Docker 23 +ENV DOCKER_BUCKET="download.docker.com" \ + DOCKER_CHANNEL="stable" \ + DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \ + DOCKER_COMPOSE_VERSION="2.17.3" \ + DOCKER_BUILDX_VERSION="0.11.0" + +ENV DOCKER_SHA256="544262F4A3621222AFB79960BFAD4D486935DAB80893478B5CC9CF8EBAF409AE" +ENV DOCKER_VERSION="23.0.6" + +VOLUME /var/lib/docker + +RUN set -ex \ + && curl -fSL "https://${DOCKER_BUCKET}/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \ + && echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \ + && tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \ + && rm docker.tgz \ + && docker -v \ + # set up subuid/subgid so that "--userns-remap=default" works out-of-the-box + && groupadd dockremap \ + && useradd -g dockremap dockremap \ + && echo 'dockremap:165536:65536' >> /etc/subuid \ + && echo 'dockremap:165536:65536' >> /etc/subgid \ + && wget -q "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \ + # Install docker compose as docker plugin and maintain docker-compose usage + && mkdir -p /usr/local/lib/docker/cli-plugins \ + && curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose \ + && chmod +x /usr/local/bin/dind /usr/local/lib/docker/cli-plugins/docker-compose \ + && ln -s /usr/local/lib/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose \ + # Ensure docker-compose and docker compose work + && docker-compose version \ + && docker compose version \ + # Add docker buildx tool + && curl -L https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o /usr/local/lib/docker/cli-plugins/docker-buildx \ + && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx \ + && ln -s /usr/local/lib/docker/cli-plugins/docker-buildx /usr/local/bin/docker-buildx \ + # Ensure docker-buildx works + && docker-buildx version \ + && docker buildx version + # Configure SSH COPY ssh_config /root/.ssh/config COPY runtimes.yml /codebuild/image/config/runtimes.yml diff --git a/al2/x86_64/standard/corretto8/Dockerfile b/al2/x86_64/standard/corretto8/Dockerfile index ce2eed06..e9d4f09f 100644 --- a/al2/x86_64/standard/corretto8/Dockerfile +++ b/al2/x86_64/standard/corretto8/Dockerfile @@ -21,7 +21,8 @@ RUN set -ex \ && touch ~/.ssh/known_hosts \ && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H github.com >> ~/.ssh/known_hosts \ && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H bitbucket.org >> ~/.ssh/known_hosts \ - && chmod 600 ~/.ssh/known_hosts + && chmod 600 ~/.ssh/known_hosts \ + && yum install -y -q make gettext-devel gcc openssl-devel curl-devel expat-devel RUN useradd codebuild-user @@ -54,6 +55,59 @@ RUN set -ex \ && ln -s /usr/local/gradle-$GRADLE_VERSION/bin/gradle /usr/bin/gradle \ && rm -rf $GRADLE_PATH +# Install Git +RUN set -ex \ + && GIT_VERSION=2.41.0 \ + && 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 \ + && tar zxf $GIT_TAR_FILE \ + && cd git-$GIT_VERSION \ + && make -j4 prefix=/usr \ + && make install prefix=/usr \ + && cd .. && rm -rf git-$GIT_VERSION \ + && rm -rf $GIT_TAR_FILE /tmp/* + +#Docker 23 +ENV DOCKER_BUCKET="download.docker.com" \ + DOCKER_CHANNEL="stable" \ + DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \ + DOCKER_COMPOSE_VERSION="2.17.3" \ + DOCKER_BUILDX_VERSION="0.11.0" + +ENV DOCKER_SHA256="544262F4A3621222AFB79960BFAD4D486935DAB80893478B5CC9CF8EBAF409AE" +ENV DOCKER_VERSION="23.0.6" + +VOLUME /var/lib/docker + +RUN set -ex \ + && curl -fSL "https://${DOCKER_BUCKET}/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \ + && echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \ + && tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \ + && rm docker.tgz \ + && docker -v \ + # set up subuid/subgid so that "--userns-remap=default" works out-of-the-box + && groupadd dockremap \ + && useradd -g dockremap dockremap \ + && echo 'dockremap:165536:65536' >> /etc/subuid \ + && echo 'dockremap:165536:65536' >> /etc/subgid \ + && wget -q "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \ + # Install docker compose as docker plugin and maintain docker-compose usage + && mkdir -p /usr/local/lib/docker/cli-plugins \ + && curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose \ + && chmod +x /usr/local/bin/dind /usr/local/lib/docker/cli-plugins/docker-compose \ + && ln -s /usr/local/lib/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose \ + # Ensure docker-compose and docker compose work + && docker-compose version \ + && docker compose version \ + # Add docker buildx tool + && curl -L https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o /usr/local/lib/docker/cli-plugins/docker-buildx \ + && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx \ + && ln -s /usr/local/lib/docker/cli-plugins/docker-buildx /usr/local/bin/docker-buildx \ + # Ensure docker-buildx works + && docker-buildx version \ + && docker buildx version + # Configure SSH COPY ssh_config /root/.ssh/config COPY runtimes.yml /codebuild/image/config/runtimes.yml diff --git a/ubuntu/standard/5.0/Dockerfile b/ubuntu/standard/5.0/Dockerfile index cdfd4247..b96eacbc 100644 --- a/ubuntu/standard/5.0/Dockerfile +++ b/ubuntu/standard/5.0/Dockerfile @@ -72,11 +72,13 @@ RUN set -ex \ && geckodriver --version # Install Chrome +ENV CHROME_VERSION="114.0.5735.198-1" + RUN set -ex \ - && wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \ - && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | tee /etc/apt/sources.list.d/google.list \ - && apt-get update \ - && apt-get install -y -qq google-chrome-stable \ + && wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb \ + && (dpkg -i /tmp/chrome.deb || apt-get -fy install) \ + && rm /tmp/chrome.deb \ + && sed -i 's|HERE/chrome"|HERE/chrome" --disable-setuid-sandbox --no-sandbox|g' "/opt/google/chrome/google-chrome" \ && google-chrome --version # Install ChromeDriver @@ -241,9 +243,9 @@ RUN rbenv install $RUBY_26_VERSION && rm -rf /tmp/* \ #**************** END RUBY ***************************************************** #**************** PYTHON ***************************************************** -ENV PYTHON_37_VERSION="3.7.16" -ENV PYTHON_38_VERSION="3.8.16" -ENV PYTHON_39_VERSION="3.9.16" +ENV PYTHON_37_VERSION="3.7.17" +ENV PYTHON_38_VERSION="3.8.17" +ENV PYTHON_39_VERSION="3.9.17" ARG PYTHON_PIP_VERSION=21.3.1 ENV PYYAML_VERSION=5.4.1 @@ -277,7 +279,7 @@ RUN set -ex \ #**************** PHP **************************************************** ENV PHP_73_VERSION="7.3.33" ENV PHP_74_VERSION="7.4.33" -ENV PHP_80_VERSION="8.0.28" +ENV PHP_80_VERSION="8.0.29" RUN curl -L https://raw.githubusercontent.com/phpenv/phpenv-installer/master/bin/phpenv-installer | bash ENV PATH="/root/.phpenv/shims:/root/.phpenv/bin:$PATH" diff --git a/ubuntu/standard/5.0/tools/runtime_configs/php/7.3.33 b/ubuntu/standard/5.0/tools/runtime_configs/php/7.3.33 index ff425a9e..71f88571 100644 --- a/ubuntu/standard/5.0/tools/runtime_configs/php/7.3.33 +++ b/ubuntu/standard/5.0/tools/runtime_configs/php/7.3.33 @@ -2,6 +2,7 @@ configure_option "--with-curl" configure_option "--with-libedit" configure_option "--with-password-argon2" configure_option "--with-pdo-pgsql" +configure_option "--with-sodium" PHP_BUILD_EXTRA_MAKE_ARGUMENTS="-j4" diff --git a/ubuntu/standard/5.0/tools/runtime_configs/php/7.4.33 b/ubuntu/standard/5.0/tools/runtime_configs/php/7.4.33 index 01e00ca2..2ad4224e 100644 --- a/ubuntu/standard/5.0/tools/runtime_configs/php/7.4.33 +++ b/ubuntu/standard/5.0/tools/runtime_configs/php/7.4.33 @@ -2,6 +2,7 @@ configure_option "--with-curl" configure_option "--with-password-argon2" configure_option "--with-pdo-pgsql" configure_option "--with-libedit" +configure_option "--with-sodium" PHP_BUILD_EXTRA_MAKE_ARGUMENTS="-j4" diff --git a/ubuntu/standard/5.0/tools/runtime_configs/php/8.0.28 b/ubuntu/standard/5.0/tools/runtime_configs/php/8.0.29 similarity index 84% rename from ubuntu/standard/5.0/tools/runtime_configs/php/8.0.28 rename to ubuntu/standard/5.0/tools/runtime_configs/php/8.0.29 index 06ad0834..d205b0f0 100644 --- a/ubuntu/standard/5.0/tools/runtime_configs/php/8.0.28 +++ b/ubuntu/standard/5.0/tools/runtime_configs/php/8.0.29 @@ -2,6 +2,7 @@ configure_option "--with-curl" configure_option "--with-password-argon2" configure_option "--with-pdo-pgsql" configure_option "--with-libedit" +configure_option "--with-sodium" PHP_BUILD_EXTRA_MAKE_ARGUMENTS="-j4" @@ -15,6 +16,6 @@ configure_option "--with-mhash" configure_option -D "--with-xmlrpc" -install_package "https://www.php.net/distributions/php-8.0.28.tar.bz2" +install_package "https://www.php.net/distributions/php-8.0.29.tar.bz2" install_xdebug "3.2.0" enable_builtin_opcache \ No newline at end of file diff --git a/ubuntu/standard/5.0/tools/runtime_configs/python/3.7.16 b/ubuntu/standard/5.0/tools/runtime_configs/python/3.7.16 deleted file mode 100644 index f6bc60f4..00000000 --- a/ubuntu/standard/5.0/tools/runtime_configs/python/3.7.16 +++ /dev/null @@ -1,17 +0,0 @@ -export PYTHON_CONFIGURE_OPTS="\ - --enable-shared - --enable-loadable-sqlite-extensions" - -# Don't change below this line. -# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.7.16 - -#require_gcc -prefer_openssl11 -export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 -install_package "openssl-1.1.1q" "https://www.openssl.org/source/openssl-1.1.1q.tar.gz#d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca" 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.7.16" "https://www.python.org/ftp/python/3.7.16/Python-3.7.16.tar.xz#8338f0c2222d847e904c955369155dc1beeeed806e8d5ef04b00ef4787238bfd" standard verify_py37 copy_python_gdb ensurepip -else - install_package "Python-3.7.16" "https://www.python.org/ftp/python/3.7.16/Python-3.7.16.tgz#0cf2da07fa464636755215415909e22eb1d058817af4824bc15af8390d05fb38" standard verify_py37 copy_python_gdb ensurepip -fi diff --git a/ubuntu/standard/5.0/tools/runtime_configs/python/3.7.17 b/ubuntu/standard/5.0/tools/runtime_configs/python/3.7.17 new file mode 100644 index 00000000..178a781a --- /dev/null +++ b/ubuntu/standard/5.0/tools/runtime_configs/python/3.7.17 @@ -0,0 +1,17 @@ +export PYTHON_CONFIGURE_OPTS="\ + --enable-shared + --enable-loadable-sqlite-extensions" + +# Don't change below this line. +# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.7.17 + +#require_gcc +prefer_openssl11 +export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 +install_package "openssl-1.1.1u" "https://www.openssl.org/source/openssl-1.1.1u.tar.gz#e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6" 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.7.17" "https://www.python.org/ftp/python/3.7.17/Python-3.7.17.tar.xz#7911051ed0422fd54b8f59ffc030f7cf2ae30e0f61bda191800bb040dce4f9d2" standard verify_py37 copy_python_gdb ensurepip +else + install_package "Python-3.7.17" "https://www.python.org/ftp/python/3.7.17/Python-3.7.17.tgz#fd50161bc2a04f4c22a0971ff0f3856d98b4bf294f89740a9f06b520aae63b49" standard verify_py37 copy_python_gdb ensurepip +fi \ No newline at end of file diff --git a/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.16 b/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.16 deleted file mode 100644 index 1fbbb6fb..00000000 --- a/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.16 +++ /dev/null @@ -1,17 +0,0 @@ -export PYTHON_CONFIGURE_OPTS="\ - --enable-shared - --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.16 - -#require_gcc -prefer_openssl11 -export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 -install_package "openssl-1.1.1q" "https://www.openssl.org/source/openssl-1.1.1q.tar.gz#d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca" 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.16" "https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tar.xz#d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562" standard verify_py38 copy_python_gdb ensurepip -else - install_package "Python-3.8.16" "https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tgz#71ca9d935637ed2feb59e90a368361dc91eca472a90acb1d344a2e8178ccaf10" standard verify_py38 copy_python_gdb ensurepip -fi diff --git a/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.17 b/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.17 new file mode 100644 index 00000000..03b0cd8e --- /dev/null +++ b/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.17 @@ -0,0 +1,20 @@ +export PYTHON_CONFIGURE_OPTS="\ + --enable-shared + --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.17 + +#require_gcc +prefer_openssl11 +export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 +# Avoid a compilation error when linking against OpenSSL built with SSLv3 support (fixed in 3.10.0) (#2181) +export PYTHON_CFLAGS="-DOPENSSL_NO_SSL3${PYTHON_CFLAGS:+ $PYTHON_CFLAGS}" + +install_package "openssl-1.1.1u" "https://www.openssl.org/source/openssl-1.1.1u.tar.gz#e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6" 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.17" "https://www.python.org/ftp/python/3.8.17/Python-3.8.17.tar.xz#2e54b0c68191f16552f6de2e97a2396540572a219f6bbb28591a137cecc490a9" standard verify_py38 copy_python_gdb ensurepip +else + install_package "Python-3.8.17" "https://www.python.org/ftp/python/3.8.17/Python-3.8.17.tgz#def428fa6cf61b66bcde72e3d9f7d07d33b2e4226f04f9d6fce8384c055113ae" standard verify_py38 copy_python_gdb ensurepip +fi \ No newline at end of file diff --git a/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.16 b/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.16 deleted file mode 100644 index 8b5c79fd..00000000 --- a/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.16 +++ /dev/null @@ -1,17 +0,0 @@ -export PYTHON_CONFIGURE_OPTS="\ - --enable-shared - --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.16 - -#require_gcc -prefer_openssl11 -export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 -install_package "openssl-1.1.1q" "https://www.openssl.org/source/openssl-1.1.1q.tar.gz#d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca" 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.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.16" "https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tgz#1ad539e9dbd2b42df714b69726e0693bc6b9d2d2c8e91c2e43204026605140c5" standard verify_py39 copy_python_gdb ensurepip -fi diff --git a/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.17 b/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.17 new file mode 100644 index 00000000..b32c9af7 --- /dev/null +++ b/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.17 @@ -0,0 +1,20 @@ +export PYTHON_CONFIGURE_OPTS="\ + --enable-shared + --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.17 + +#require_gcc +prefer_openssl11 +export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 +# Avoid a compilation error when linking against OpenSSL built with SSLv3 support (fixed in 3.10.0) (#2181) +export PYTHON_CFLAGS="-DOPENSSL_NO_SSL3${PYTHON_CFLAGS:+ $PYTHON_CFLAGS}" + +install_package "openssl-1.1.1u" "https://www.openssl.org/source/openssl-1.1.1u.tar.gz#e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6" 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.17" "https://www.python.org/ftp/python/3.9.17/Python-3.9.17.tar.xz#30ce057c44f283f8ed93606ccbdb8d51dd526bdc4c62cce5e0dc217bfa3e8cee" standard verify_py39 copy_python_gdb ensurepip +else + install_package "Python-3.9.17" "https://www.python.org/ftp/python/3.9.17/Python-3.9.17.tgz#8ead58f669f7e19d777c3556b62fae29a81d7f06a7122ff9bc57f7dd82d7e014" standard verify_py39 copy_python_gdb ensurepip +fi \ No newline at end of file diff --git a/ubuntu/standard/6.0/Dockerfile b/ubuntu/standard/6.0/Dockerfile index 37e27a34..5e3af38d 100644 --- a/ubuntu/standard/6.0/Dockerfile +++ b/ubuntu/standard/6.0/Dockerfile @@ -143,7 +143,7 @@ FROM tools AS runtimes #**************** .NET-CORE ******************************************************* -ENV DOTNET_6_SDK_VERSION="6.0.408" +ENV DOTNET_6_SDK_VERSION="6.0.410" ENV DOTNET_ROOT="/root/.dotnet" # Add .NET Core 6 Global Tools install folder to PATH @@ -179,7 +179,7 @@ RUN set -ex \ #**************** NODEJS **************************************************** -ENV NODE_16_VERSION="16.20.0" +ENV NODE_16_VERSION="16.20.1" 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 -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ @@ -200,7 +200,7 @@ RUN rbenv install $RUBY_31_VERSION && rm -rf /tmp/* \ #**************** END RUBY ***************************************************** #**************** PYTHON ***************************************************** -ENV PYTHON_310_VERSION="3.10.10" +ENV PYTHON_310_VERSION="3.10.12" ARG PYTHON_PIP_VERSION=22.3.1 ENV PYYAML_VERSION=5.4.1 @@ -216,7 +216,7 @@ RUN set -ex \ #**************** END PYTHON ***************************************************** #**************** PHP **************************************************** -ENV PHP_81_VERSION="8.1.18" +ENV PHP_81_VERSION="8.1.20" 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 @@ -246,15 +246,15 @@ ENV JAVA_17_HOME="/usr/lib/jvm/java-17-amazon-corretto" \ JRE_17_HOME="/usr/lib/jvm/java-17-amazon-corretto" ARG ANT_VERSION=1.10.13 ARG MAVEN_HOME="/opt/maven" -ARG MAVEN_VERSION=3.9.1 -ARG INSTALLED_GRADLE_VERSIONS="7.6" -ARG GRADLE_VERSION=7.6 -ARG SBT_VERSION=1.8.2 +ARG MAVEN_VERSION=3.9.2 +ARG INSTALLED_GRADLE_VERSIONS="7.6.1" +ARG GRADLE_VERSION=7.6.1 +ARG SBT_VERSION=1.8.3 ARG GRADLE_PATH="$SRC_DIR/gradle" ARG ANT_DOWNLOAD_SHA512="de4ac604629e39a86a306f0541adb3775596909ad92feb8b7de759b1b286417db24f557228737c8b902d6abf722d2ce5bb0c3baa3640cbeec3481e15ab1958c9" -ARG MAVEN_DOWNLOAD_SHA512="d3be5956712d1c2cf7a6e4c3a2db1841aa971c6097c7a67f59493a5873ccf8c8b889cf988e4e9801390a2b1ae5a0669de07673acb090a083232dbd3faf82f3e3" -ARG GRADLE_DOWNLOADS_SHA256="312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d 7.6" -ARG SBT_DOWNLOAD_SHA256="1f65344da074dbd66dfefa93c0eff8d319d772e5cad47fcbeb6ae178bbdf4686" +ARG MAVEN_DOWNLOAD_SHA512="900bdeeeae550d2d2b3920fe0e00e41b0069f32c019d566465015bdd1b3866395cbe016e22d95d25d51d3a5e614af2c83ec9b282d73309f644859bbad08b63db" +ARG GRADLE_DOWNLOADS_SHA256="518a863631feb7452b8f1b3dc2aaee5f388355cc3421bbd0275fbeadd77e84b2 7.6.1" +ARG SBT_DOWNLOAD_SHA256="21F4210786FD68FD15DCA3F4C8EE9CAE0DB249C54E1B0EF6E829E9FA4936423A" ENV LOG4J_UNSAFE_VERSIONS="2.11.1 1.2.8" ARG MAVEN_CONFIG_HOME="/root/.m2" @@ -338,6 +338,7 @@ ARG DOCKER_BUCKET="download.docker.com" ARG DOCKER_CHANNEL="stable" ARG DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" ARG DOCKER_COMPOSE_VERSION="2.17.3" +ARG DOCKER_BUILDX_VERSION="0.11.0" ARG SRC_DIR="/usr/src" ARG DOCKER_SHA256="AB91092320A87691A1EAF0225B48585DB9C69CFF0ED4B0F569F744FF765515E3" @@ -359,7 +360,14 @@ RUN set -ex \ && curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 > /usr/local/bin/docker-compose \ && chmod +x /usr/local/bin/dind /usr/local/bin/docker-compose \ # Ensure docker-compose works - && docker-compose version + && docker-compose version \ + && mkdir -p /usr/local/lib/docker/cli-plugins \ + && curl -L https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o /usr/local/lib/docker/cli-plugins/docker-buildx \ + && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx \ + && ln -s /usr/local/lib/docker/cli-plugins/docker-buildx /usr/local/bin/docker-buildx \ + # Ensure docker-buildx works + && docker-buildx version \ + && docker buildx version VOLUME /var/lib/docker #*********************** END DOCKER **************************** diff --git a/ubuntu/standard/6.0/tools/runtime_configs/php/8.1.18 b/ubuntu/standard/6.0/tools/runtime_configs/php/8.1.20 similarity index 84% rename from ubuntu/standard/6.0/tools/runtime_configs/php/8.1.18 rename to ubuntu/standard/6.0/tools/runtime_configs/php/8.1.20 index 142b51c8..f890e28c 100644 --- a/ubuntu/standard/6.0/tools/runtime_configs/php/8.1.18 +++ b/ubuntu/standard/6.0/tools/runtime_configs/php/8.1.20 @@ -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.1.18 +#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/8.1.20 #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://www.php.net/distributions/php-8.1.18.tar.bz2" +install_package "https://www.php.net/distributions/php-8.1.20.tar.bz2" install_xdebug "3.2.0" enable_builtin_opcache \ No newline at end of file diff --git a/ubuntu/standard/6.0/tools/runtime_configs/python/3.10.10 b/ubuntu/standard/6.0/tools/runtime_configs/python/3.10.12 similarity index 69% rename from ubuntu/standard/6.0/tools/runtime_configs/python/3.10.10 rename to ubuntu/standard/6.0/tools/runtime_configs/python/3.10.12 index 18551f05..6fd13001 100644 --- a/ubuntu/standard/6.0/tools/runtime_configs/python/3.10.10 +++ b/ubuntu/standard/6.0/tools/runtime_configs/python/3.10.12 @@ -4,6 +4,7 @@ export PYTHON_CONFIGURE_OPTS="\ # Don't change below this line. # https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.10.10 +# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.10.12 # require_gcc prefer_openssl11 @@ -12,6 +13,8 @@ install_package "openssl-1.1.1o" "https://www.openssl.org/source/openssl-1.1.1o. 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.10.10" "https://www.python.org/ftp/python/3.10.10/Python-3.10.10.tar.xz#0419e9085bf51b7a672009b3f50dbf1859acdf18ba725d0ec19aa5c8503f0ea3" standard verify_py310 copy_python_gdb ensurepip + install_package "Python-3.10.12" "https://www.python.org/ftp/python/3.10.12/Python-3.10.12.tar.xz#afb74bf19130e7a47d10312c8f5e784f24e0527981eab68e20546cfb865830b8" standard verify_py310 copy_python_gdb ensurepip else install_package "Python-3.10.10" "https://www.python.org/ftp/python/3.10.10/Python-3.10.10.tgz#fba64559dde21ebdc953e4565e731573bb61159de8e4d4cedee70fb1196f610d" standard verify_py310 copy_python_gdb ensurepip + install_package "Python-3.10.12" "https://www.python.org/ftp/python/3.10.12/Python-3.10.12.tgz#a43cd383f3999a6f4a7db2062b2fc9594fefa73e175b3aedafa295a51a7bb65c" standard verify_py310 copy_python_gdb ensurepip fi \ No newline at end of file diff --git a/ubuntu/standard/7.0/Dockerfile b/ubuntu/standard/7.0/Dockerfile index f2bd70d7..4685000f 100644 --- a/ubuntu/standard/7.0/Dockerfile +++ b/ubuntu/standard/7.0/Dockerfile @@ -143,7 +143,7 @@ FROM tools AS runtimes #**************** .NET-CORE ******************************************************* -ENV DOTNET_6_SDK_VERSION="6.0.408" +ENV DOTNET_6_SDK_VERSION="6.0.410" ENV DOTNET_ROOT="/root/.dotnet" # Add .NET Core 6 Global Tools install folder to PATH @@ -179,9 +179,13 @@ RUN set -ex \ #**************** NODEJS **************************************************** -ENV NODE_18_VERSION="18.16.0" +ENV NODE_18_VERSION="18.16.1" RUN n $NODE_18_VERSION && npm install --save-dev -g -f grunt && npm install --save-dev -g -f grunt-cli && npm install --save-dev -g -f webpack \ + && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ + && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update && apt-get install -y -qq --no-install-recommends yarn \ + && yarn --version \ && cd / && rm -rf $N_SRC_DIR && rm -rf /tmp/* #**************** END NODEJS **************************************************** @@ -196,7 +200,7 @@ RUN rbenv install $RUBY_32_VERSION && rm -rf /tmp/* \ #**************** END RUBY ***************************************************** #**************** PYTHON ***************************************************** -ENV PYTHON_311_VERSION="3.11.2" +ENV PYTHON_311_VERSION="3.11.4" ARG PYTHON_PIP_VERSION=23.1.1 ENV PYYAML_VERSION=6.0 @@ -212,7 +216,7 @@ RUN set -ex \ #**************** END PYTHON ***************************************************** #**************** PHP **************************************************** -ENV PHP_82_VERSION="8.2.5" +ENV PHP_82_VERSION="8.2.7" COPY tools/runtime_configs/php/$PHP_82_VERSION /root/.phpenv/plugins/php-build/share/php-build/definitions/$PHP_82_VERSION RUN phpenv install $PHP_82_VERSION && rm -rf /tmp/* && phpenv global $PHP_82_VERSION @@ -223,7 +227,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin - #**************** END PHP **************************************************** #**************** GOLANG **************************************************** -ENV GOLANG_20_VERSION="1.20.3" +ENV GOLANG_20_VERSION="1.20.5" RUN goenv install $GOLANG_20_VERSION && rm -rf /tmp/* && \ goenv global $GOLANG_20_VERSION && \ @@ -241,14 +245,14 @@ ENV JAVA_17_HOME="/usr/lib/jvm/java-17-amazon-corretto" \ JRE_17_HOME="/usr/lib/jvm/java-17-amazon-corretto" ARG ANT_VERSION=1.10.13 ARG MAVEN_HOME="/opt/maven" -ARG MAVEN_VERSION=3.9.1 +ARG MAVEN_VERSION=3.9.2 ARG GRADLE_VERSION=8.1.1 -ARG SBT_VERSION=1.8.2 +ARG SBT_VERSION=1.8.3 ARG GRADLE_PATH="$SRC_DIR/gradle" ARG ANT_DOWNLOAD_SHA512="de4ac604629e39a86a306f0541adb3775596909ad92feb8b7de759b1b286417db24f557228737c8b902d6abf722d2ce5bb0c3baa3640cbeec3481e15ab1958c9" -ARG MAVEN_DOWNLOAD_SHA512="d3be5956712d1c2cf7a6e4c3a2db1841aa971c6097c7a67f59493a5873ccf8c8b889cf988e4e9801390a2b1ae5a0669de07673acb090a083232dbd3faf82f3e3" +ARG MAVEN_DOWNLOAD_SHA512="900bdeeeae550d2d2b3920fe0e00e41b0069f32c019d566465015bdd1b3866395cbe016e22d95d25d51d3a5e614af2c83ec9b282d73309f644859bbad08b63db" ARG GRADLE_DOWNLOADS_SHA256="5625a0ae20fe000d9225d000b36909c7a0e0e8dda61c19b12da769add847c975 8.1.1" -ARG SBT_DOWNLOAD_SHA256="1f65344da074dbd66dfefa93c0eff8d319d772e5cad47fcbeb6ae178bbdf4686" +ARG SBT_DOWNLOAD_SHA256="21F4210786FD68FD15DCA3F4C8EE9CAE0DB249C54E1B0EF6E829E9FA4936423A" ARG MAVEN_CONFIG_HOME="/root/.m2" @@ -327,11 +331,11 @@ ARG DOCKER_BUCKET="download.docker.com" ARG DOCKER_CHANNEL="stable" ARG DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" ARG DOCKER_COMPOSE_VERSION="2.17.3" -ARG DOCKER_BUILDX_VERSION="0.10.4" +ARG DOCKER_BUILDX_VERSION="0.11.0" ARG SRC_DIR="/usr/src" -ARG DOCKER_SHA256="81BD643A32B3428F6D9EAFBD9331D0DA1577C958C1C2702DB1EFF7AFA1CDF3CD" -ARG DOCKER_VERSION="23.0.4" +ARG DOCKER_SHA256="544262F4A3621222AFB79960BFAD4D486935DAB80893478B5CC9CF8EBAF409AE" +ARG DOCKER_VERSION="23.0.6" # Install Docker RUN set -ex \ @@ -349,16 +353,18 @@ RUN set -ex \ # Install docker compose as docker plugin and maintain docker-compose usage && mkdir -p /usr/local/lib/docker/cli-plugins \ && curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose \ - && chmod +x /usr/local/lib/docker/cli-plugins/docker-compose \ + && chmod +x /usr/local/bin/dind /usr/local/lib/docker/cli-plugins/docker-compose \ && ln -s /usr/local/lib/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose \ # Ensure docker-compose and docker compose work && docker-compose version \ && docker compose version \ # Add docker buildx tool - && curl -L https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o /usr/local/bin/docker-buildx \ - && chmod +x /usr/local/bin/dind /usr/local/bin/docker-buildx \ + && curl -L https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o /usr/local/lib/docker/cli-plugins/docker-buildx \ + && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx \ + && ln -s /usr/local/lib/docker/cli-plugins/docker-buildx /usr/local/bin/docker-buildx \ # Ensure docker-buildx works - && docker-buildx version + && docker-buildx version \ + && docker buildx version VOLUME /var/lib/docker #*********************** END DOCKER **************************** diff --git a/al2/x86_64/standard/5.0/tools/runtime_configs/php/8.2.5 b/ubuntu/standard/7.0/tools/runtime_configs/php/8.2.7 similarity index 85% rename from al2/x86_64/standard/5.0/tools/runtime_configs/php/8.2.5 rename to ubuntu/standard/7.0/tools/runtime_configs/php/8.2.7 index 90918de7..352b6d5b 100644 --- a/al2/x86_64/standard/5.0/tools/runtime_configs/php/8.2.5 +++ b/ubuntu/standard/7.0/tools/runtime_configs/php/8.2.7 @@ -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.2.4 +#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/8.2.7 #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://www.php.net/distributions/php-8.2.5.tar.bz2" +install_package "https://www.php.net/distributions/php-8.2.7.tar.bz2" install_xdebug "3.2.0" enable_builtin_opcache \ No newline at end of file diff --git a/al2/x86_64/standard/5.0/tools/runtime_configs/python/3.11.2 b/ubuntu/standard/7.0/tools/runtime_configs/python/3.11.4 similarity index 69% rename from al2/x86_64/standard/5.0/tools/runtime_configs/python/3.11.2 rename to ubuntu/standard/7.0/tools/runtime_configs/python/3.11.4 index e3a8deb1..6cb3ca0d 100644 --- a/al2/x86_64/standard/5.0/tools/runtime_configs/python/3.11.2 +++ b/ubuntu/standard/7.0/tools/runtime_configs/python/3.11.4 @@ -4,6 +4,7 @@ export PYTHON_CONFIGURE_OPTS="\ # Don't change below this line. # https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.11.2 +# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.11.4 #require_gcc prefer_openssl11 @@ -13,6 +14,8 @@ install_package "openssl-1.1.1s" "https://www.openssl.org/source/openssl-1.1.1s. install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline if has_tar_xz_support; then install_package "Python-3.11.2" "https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tar.xz#29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af" standard verify_py311 copy_python_gdb ensurepip + install_package "Python-3.11.4" "https://www.python.org/ftp/python/3.11.4/Python-3.11.4.tar.xz#2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6" standard verify_py311 copy_python_gdb ensurepip else install_package "Python-3.11.2" "https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tgz#2411c74bda5bbcfcddaf4531f66d1adc73f247f529aee981b029513aefdbf849" standard verify_py311 copy_python_gdb ensurepip + install_package "Python-3.11.4" "https://www.python.org/ftp/python/3.11.4/Python-3.11.4.tgz#85c37a265e5c9dd9f75b35f954e31fbfc10383162417285e30ad25cc073a0d63" standard verify_py311 copy_python_gdb ensurepip fi \ No newline at end of file