Skip to content

Commit 4e975ad

Browse files
subinatawssubinataws
authored
Merge pull request #639 from Dylan-AWS/master
Add al2/x86_64/standard/5.0, update supported images
2 parents bc0d392 + 318e7b8 commit 4e975ad

File tree

20 files changed

+844
-100
lines changed

20 files changed

+844
-100
lines changed

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ The following images are actively maintained by AWS CodeBuild, and are listed in
3838
+ [standard 6.0](ubuntu/standard/6.0)
3939
+ [standard 7.0](ubuntu/standard/7.0)
4040
+ [amazonlinux2-x86_64-standard:4.0](al2/x86_64/standard/4.0)
41+
+ [amazonlinux2-x86_64-standard:5.0](al2/x86_64/standard/5.0)
4142
+ [amazonlinux2-x86_64-standard:corretto8](al2/x86_64/standard/corretto8)
4243
+ [amazonlinux2-x86_64-standard:corretto11](al2/x86_64/standard/corretto11)
4344
+ [amazonlinux2-aarch64-standard:2.0](al2/aarch64/standard/2.0)

‎al2/x86_64/standard/4.0/Dockerfile

+18-18
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ RUN set -ex \
6363

6464
# Install stunnel
6565
RUN set -ex \
66-
&& STUNNEL_VERSION=5.67 \
66+
&& STUNNEL_VERSION=5.69 \
6767
&& STUNNEL_TAR=stunnel-$STUNNEL_VERSION.tar.gz \
68-
&& STUNNEL_SHA256="3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456" \
68+
&& STUNNEL_SHA256="1ff7d9f30884c75b98c8a0a4e1534fa79adcada2322635e6787337b4e38fdb81" \
6969
&& 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 \
7070
&& cd stunnel-$STUNNEL_VERSION \
7171
&& ./configure \
@@ -135,15 +135,15 @@ FROM tools AS runtimes_1
135135
ENV JAVA_17_HOME="/usr/lib/jvm/java-17-amazon-corretto.x86_64" \
136136
JDK_17_HOME="/usr/lib/jvm/java-17-amazon-corretto.x86_64" \
137137
JRE_17_HOME="/usr/lib/jvm/java-17-amazon-corretto.x86_64" \
138-
ANT_VERSION=1.10.12 \
138+
ANT_VERSION=1.10.13 \
139139
MAVEN_HOME="/opt/maven" \
140-
MAVEN_VERSION=3.8.7 \
140+
MAVEN_VERSION=3.9.1 \
141141
INSTALLED_GRADLE_VERSIONS="7.6" \
142142
GRADLE_VERSION=7.6 \
143143
SBT_VERSION=1.8.2 \
144144
GRADLE_PATH="$SRC_DIR/gradle" \
145-
ANT_DOWNLOAD_SHA512="2287dc5cfc21043c14e5413f9afb1c87c9f266ec2a9ba2d3bf2285446f6e4ccb59b558bf2e5c57911a05dfa293c7d5c7ad60ac9f744ba11406f4e6f9a27b2403" \
146-
MAVEN_DOWNLOAD_SHA512="21c2be0a180a326353e8f6d12289f74bc7cd53080305f05358936f3a1b6dd4d91203f4cc799e81761cf5c53c5bbe9dcc13bdb27ec8f57ecf21b2f9ceec3c8d27" \
145+
ANT_DOWNLOAD_SHA512="de4ac604629e39a86a306f0541adb3775596909ad92feb8b7de759b1b286417db24f557228737c8b902d6abf722d2ce5bb0c3baa3640cbeec3481e15ab1958c9" \
146+
MAVEN_DOWNLOAD_SHA512="d3be5956712d1c2cf7a6e4c3a2db1841aa971c6097c7a67f59493a5873ccf8c8b889cf988e4e9801390a2b1ae5a0669de07673acb090a083232dbd3faf82f3e3" \
147147
GRADLE_DOWNLOADS_SHA256="312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d 7.6" \
148148
SBT_DOWNLOAD_SHA256="1f65344da074dbd66dfefa93c0eff8d319d772e5cad47fcbeb6ae178bbdf4686" \
149149
LOG4J_UNSAFE_VERSIONS="2.11.1 1.2.8"
@@ -218,9 +218,9 @@ RUN rm -fr /tmp/* /var/tmp/*
218218

219219
# Install Powershell Core
220220
# See instructions at https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-powershell-core-on-linux
221-
ENV POWERSHELL_VERSION 7.2.8
221+
ENV POWERSHELL_VERSION 7.2.11
222222
ENV POWERSHELL_DOWNLOAD_URL https://github.com/PowerShell/PowerShell/releases/download/v$POWERSHELL_VERSION/powershell-$POWERSHELL_VERSION-linux-x64.tar.gz
223-
ENV POWERSHELL_DOWNLOAD_SHA 28FF2653667AC63B508F0B98433E48F64E6BC1EC59F8C1D252BA89EB5A7441A2
223+
ENV POWERSHELL_DOWNLOAD_SHA 9D6F798461D172391B508FCF27F9CBBB4BEF307EBFD6886ED50860C322C7D1B3
224224

225225
RUN set -ex \
226226
&& curl -SL $POWERSHELL_DOWNLOAD_URL --output powershell.tar.gz \
@@ -231,7 +231,7 @@ RUN set -ex \
231231
&& ln -s /opt/microsoft/powershell/$POWERSHELL_VERSION/pwsh /usr/bin/pwsh
232232

233233
#DotNet 6.0
234-
ENV DOTNET_60_SDK_VERSION="6.0.405"
234+
ENV DOTNET_60_SDK_VERSION="6.0.408"
235235
ENV DOTNET_ROOT="/root/.dotnet"
236236

237237
# Add .NET Core 6.0 Global Tools install folder to PATH
@@ -253,7 +253,7 @@ RUN set -ex \
253253

254254
#**************** NODEJS ****************************************************
255255

256-
ENV NODE_16_VERSION="16.19.0"
256+
ENV NODE_16_VERSION="16.20.0"
257257

258258
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 \
259259
&& 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
267267

268268
#**************** RUBY *********************************************************
269269

270-
ENV RUBY_31_VERSION="3.1.3"
270+
ENV RUBY_31_VERSION="3.1.4"
271271

272272
RUN rbenv install $RUBY_31_VERSION && rm -rf /tmp/* && rbenv global $RUBY_31_VERSION && ruby -v
273273

@@ -276,7 +276,7 @@ RUN rbenv install $RUBY_31_VERSION && rm -rf /tmp/* && rbenv global $RUBY_31_VER
276276
#**************** PYTHON *****************************************************
277277
#Python 3.9
278278
ENV PYTHON_39_VERSION="3.9.16"
279-
ENV PYTHON_PIP_VERSION=21.1.2
279+
ENV PYTHON_PIP_VERSION=21.3.1
280280
ENV PYYAML_VERSION=5.4.1
281281

282282
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
285285
RUN set -ex \
286286
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
287287
&& pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
288-
&& pip3 install --no-cache-dir --upgrade 'setuptools==57.4.0' wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
288+
&& pip3 install --no-cache-dir --upgrade 'setuptools==57.5.0' wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
289289

290290
#**************** END PYTHON *****************************************************
291291

292292
#**************** PHP ****************************************************
293-
ENV PHP_81_VERSION="8.1.13"
293+
ENV PHP_81_VERSION="8.1.18"
294294

295295
COPY tools/runtime_configs/php/$PHP_81_VERSION /root/.phpenv/plugins/php-build/share/php-build/definitions/$PHP_81_VERSION
296296
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 -
301301
#**************** END PHP ****************************************************
302302

303303
#**************** GOLANG ****************************************************
304-
ENV GOLANG_18_VERSION="1.18.9"
304+
ENV GOLANG_18_VERSION="1.18.10"
305305
ENV GOENV_DISABLE_GOPATH=1
306306
ENV GOPATH="/go"
307307

@@ -319,10 +319,10 @@ FROM runtimes_1 AS runtimes_2
319319
ENV DOCKER_BUCKET="download.docker.com" \
320320
DOCKER_CHANNEL="stable" \
321321
DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \
322-
DOCKER_COMPOSE_VERSION="1.26.2"
322+
DOCKER_COMPOSE_VERSION="1.29.2"
323323

324-
ENV DOCKER_SHA256="945C3A3DDCB79EE7307496C2F39EB3D8372466E8654E63D60BBB462E4A3C1427"
325-
ENV DOCKER_VERSION="20.10.22"
324+
ENV DOCKER_SHA256="AB91092320A87691A1EAF0225B48585DB9C69CFF0ED4B0F569F744FF765515E3"
325+
ENV DOCKER_VERSION="20.10.24"
326326

327327
VOLUME /var/lib/docker
328328

‎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

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ 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/8.0.26
8+
#https://github.com/php-build/php-build/blob/master/share/php-build/definitions/8.1.18
99
#Don't change beyond this line
1010

1111
configure_option "--enable-gd"
@@ -15,6 +15,6 @@ configure_option "--with-mhash"
1515

1616
configure_option -D "--with-xmlrpc"
1717

18-
install_package "https://secure.php.net/distributions/php-8.0.26.tar.bz2"
19-
install_xdebug "3.1.3"
20-
enable_builtin_opcache
18+
install_package "https://www.php.net/distributions/php-8.1.18.tar.bz2"
19+
install_xdebug "3.2.0"
20+
enable_builtin_opcache

0 commit comments

Comments
 (0)