Skip to content

Commit dd20c63

Browse files
awszhenawszhen
authored
Merge pull request #756 from xinyu-aws/master
Apply image updates
2 parents 2898ad3 + 95e7c03 commit dd20c63

20 files changed

+794
-319
lines changed

‎al/x86_64/standard/4.0/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,24 +133,24 @@ FROM tools AS runtimes_1
133133
#**************** Pack CLI *************************************************
134134
RUN (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.32.1/pack-v0.32.1-linux.tgz" \
135135
| tar -C /usr/local/bin/ --no-same-owner -xzv pack)
136-
136+
137137
#**************** END Pack CLI *********************************************
138-
138+
139139
#**************** JAVA ****************************************************
140140

141141
ENV JAVA_17_HOME="/usr/lib/jvm/java-17-amazon-corretto.x86_64" \
142142
JDK_17_HOME="/usr/lib/jvm/java-17-amazon-corretto.x86_64" \
143143
JRE_17_HOME="/usr/lib/jvm/java-17-amazon-corretto.x86_64" \
144144
ANT_VERSION=1.10.13 \
145145
MAVEN_HOME="/opt/maven" \
146-
MAVEN_VERSION=3.9.2 \
147-
INSTALLED_GRADLE_VERSIONS="7.6.1" \
148-
GRADLE_VERSION=7.6.1 \
146+
MAVEN_VERSION=3.9.5 \
147+
INSTALLED_GRADLE_VERSIONS="7.6.2" \
148+
GRADLE_VERSION=7.6.2 \
149149
SBT_VERSION=1.8.3 \
150150
GRADLE_PATH="$SRC_DIR/gradle" \
151151
ANT_DOWNLOAD_SHA512="de4ac604629e39a86a306f0541adb3775596909ad92feb8b7de759b1b286417db24f557228737c8b902d6abf722d2ce5bb0c3baa3640cbeec3481e15ab1958c9" \
152-
MAVEN_DOWNLOAD_SHA512="900bdeeeae550d2d2b3920fe0e00e41b0069f32c019d566465015bdd1b3866395cbe016e22d95d25d51d3a5e614af2c83ec9b282d73309f644859bbad08b63db" \
153-
GRADLE_DOWNLOADS_SHA256="518a863631feb7452b8f1b3dc2aaee5f388355cc3421bbd0275fbeadd77e84b2 7.6.1" \
152+
MAVEN_DOWNLOAD_SHA512="4810523ba025104106567d8a15a8aa19db35068c8c8be19e30b219a1d7e83bcab96124bf86dc424b1cd3c5edba25d69ec0b31751c136f88975d15406cab3842b" \
153+
GRADLE_DOWNLOADS_SHA256="5861dcc093556fef71cdde8cbae9887be70a8bf40e0f5856b61181ae92dccf33 7.6.2" \
154154
SBT_DOWNLOAD_SHA256="21F4210786FD68FD15DCA3F4C8EE9CAE0DB249C54E1B0EF6E829E9FA4936423A" \
155155
LOG4J_UNSAFE_VERSIONS="2.11.1 1.2.8"
156156

‎al/x86_64/standard/4.0/dockerd-entrypoint.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
#!/bin/sh
22
set -e
33

4+
if [ "$CODEBUILD_GPU_BUILD" = "true" ]; then
5+
mkdir -p /etc/docker
6+
echo "{}" >> /etc/docker/daemon.json
7+
curl -s -L https://nvidia.github.io/libnvidia-container/stable/rpm/nvidia-container-toolkit.repo | tee /etc/yum.repos.d/nvidia-container-toolkit.repo
8+
yum install -y nvidia-container-toolkit
9+
nvidia-ctk runtime configure --runtime=docker
10+
export NVIDIA_VISIBLE_DEVICES=all
11+
export NVIDIA_DRIVER_CAPABILITIES=compute,utility
12+
fi
13+
414
/usr/local/bin/dockerd \
515
--host=unix:///var/run/docker.sock \
616
--host=tcp://127.0.0.1:2375 \

‎al/x86_64/standard/5.0/Dockerfile

Lines changed: 223 additions & 118 deletions
Large diffs are not rendered by default.

‎al/x86_64/standard/5.0/dockerd-entrypoint.sh

100755100644
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
#!/bin/sh
22
set -e
33

4+
if [ "$CODEBUILD_GPU_BUILD" = "true" ]; then
5+
mkdir -p /etc/docker
6+
echo "{}" >> /etc/docker/daemon.json
7+
curl -s -L https://nvidia.github.io/libnvidia-container/stable/rpm/nvidia-container-toolkit.repo | tee /etc/yum.repos.d/nvidia-container-toolkit.repo
8+
yum install -y nvidia-container-toolkit
9+
nvidia-ctk runtime configure --runtime=docker
10+
export NVIDIA_VISIBLE_DEVICES=all
11+
export NVIDIA_DRIVER_CAPABILITIES=compute,utility
12+
fi
13+
414
/usr/local/bin/dockerd \
515
--host=unix:///var/run/docker.sock \
616
--host=tcp://127.0.0.1:2375 \

‎al/x86_64/standard/5.0/legal/bill_of_material.txt

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,30 @@ ImageMagick : ImageMagick
77
----------------
88
asciidoc : GPL+ and GPLv2+
99
----------------
10+
bison : GPL
11+
----------------
12+
brotli : MIT
13+
----------------
1014
bzip2-devel : BSD
1115
----------------
1216
bzr : GPLv2+
1317
----------------
1418
bzrtools : GPLv2+
1519
----------------
20+
chromedriver : 3-clause BSD
21+
----------------
1622
chromium : BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
1723
----------------
24+
coreutils : GPL
25+
----------------
1826
cvs : BSD and GPL+ and GPLv2+ and LGPLv2+ and zlib and Public Domain
1927
----------------
2028
cvsps : GPL+
2129
----------------
2230
dbus-glib-devel : AFL and GPLv2+
2331
----------------
32+
dnsutils : MPL-2.0 and ISC and BSD-2-clause and BSD-3-clause
33+
----------------
2434
docbook-dtds : Copyright only
2535
----------------
2636
docbook-style-xsl : DMIT
@@ -35,10 +45,20 @@ expect : Public Domain
3545
----------------
3646
fakeroot : GPLv3+ and LGPLv2+ and (GPL+ or Artistic)
3747
----------------
48+
flex : BSD
49+
----------------
50+
ftp : GPL
51+
----------------
52+
geckodriver : Mozilla Public License 2.0 https://github.com/mozilla/geckodriver/blob/master/LICENSE
53+
----------------
3854
glib2-devel : LGPLv2+
3955
----------------
56+
glibc-all-langpacks : LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ and GPLv2+ with exceptions and BSD and Inner-Net and ISC and Public Domain and GFDL
57+
----------------
4058
git-lfs : /usr/share/doc/git-lfs/copyright
4159
----------------
60+
gnupg2 : GPL-3+
61+
----------------
4262
groff : GPLv3+ and GFDL and BSD and MIT
4363
----------------
4464
gtk3-devel : LGPLv2+
@@ -49,6 +69,8 @@ icu : MIT and UCD and Public Domain
4969
----------------
5070
iptables : GPLv2
5171
----------------
72+
iputils : BSD-3-Clause and GPLv2+
73+
----------------
5274
pack: https://github.com/buildpacks/pack/blob/main/LICENSE
5375
----------------
5476
java-1.8.0-amazon-corretto-devel : ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib.
@@ -77,6 +99,8 @@ libicu-devel : MIT and UCD and Public Domain
7799
----------------
78100
libpng-devel : zlib
79101
----------------
102+
libsecret-devel : LGPLv2+
103+
----------------
80104
libserf : ASL 2.0
81105
----------------
82106
libsqlite3x-devel : zlib
@@ -87,6 +111,8 @@ libunwind : BSD
87111
----------------
88112
libwebp-devel : BSD
89113
----------------
114+
libxkbfile-devel : MIT-open-group AND HPND AND SMLNJ
115+
----------------
90116
libxml2-devel : MIT
91117
----------------
92118
libxslt : MIT
@@ -97,14 +123,24 @@ libyaml-devel : MIT
97123
----------------
98124
libzip-devel : BSD
99125
----------------
126+
lz4 : GPLv2+ and BSD
127+
----------------
128+
m4 : GPLv3+
129+
----------------
130+
make : GPLv3+
131+
----------------
100132
mariadb-devel : GPLv2 with exceptions and LGPLv2 and BSD
101133
----------------
102134
mercurial : GPLv2+
103135
----------------
136+
mesa-libgbm-devel : MIT AND BSD-3-Clause AND SGI-B-2.0
137+
----------------
104138
mlocate : GPLv2
105139
----------------
106140
mono-devel : LGPL-2.1
107141
----------------
142+
net-tools : GPLv2+
143+
----------------
108144
ncurses-devel : MIT
109145
----------------
110146
oniguruma-devel : BSD
@@ -115,6 +151,12 @@ openssl : OpenSSL
115151
----------------
116152
openssl-devel : OpenSSL
117153
----------------
154+
p7zip p7zip-plugins : LGPLv2 and (LGPLv2+ or CPL)
155+
----------------
156+
parallel : GPLv3+
157+
----------------
158+
patchelf : GPLv3+
159+
----------------
118160
perl-DBD-SQLite : GPL+ or Artistic
119161
----------------
120162
perl-DBI : GPL+ or Artistic
@@ -127,6 +169,8 @@ perl-TimeDate : GPL+ or Artistic
127169
----------------
128170
perl-YAML-LibYAML : GPL+ or Artistic
129171
----------------
172+
pigz : zlib
173+
----------------
130174
postgresql-devel : PostgreSQL
131175
----------------
132176
procps-ng : GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
@@ -135,18 +179,38 @@ python-configobj : BSD
135179
----------------
136180
readline-devel : GPLv3+
137181
----------------
182+
rpm : GPLv2+
183+
----------------
138184
rsync : GPLv3+
139185
----------------
140186
sbt : BSD
141187
----------------
188+
selenium : Apache License 2.0 https://github.com/SeleniumHQ/selenium/blob/trunk/LICENSE
189+
----------------
142190
sgml-common : GPL+
143191
----------------
192+
sphinx : GPLv2+
193+
----------------
194+
sshpass : GPLv2
195+
----------------
196+
subversion : ASL 2.0
197+
----------------
144198
subversion-perl : ASL 2.0
145199
----------------
200+
sudo : ISC
201+
----------------
202+
swig : GPL-3.0-or-later AND BSD-3-Clause
203+
----------------
146204
tar : GPLv3+
147205
----------------
148206
tcl : TCL
149207
----------------
208+
telnet : BSD
209+
----------------
210+
texinfo : GPLv3+
211+
----------------
212+
time : GPLv3+ and GFDL
213+
----------------
150214
tk : TCL
151215
----------------
152216
wget : GPLv3+
@@ -159,10 +223,16 @@ xmlto : GPLv2+
159223
----------------
160224
xorg-x11-server-Xvfb : MIT and GPLv2
161225
----------------
226+
xorriso : GPL-2.0-or-later
227+
----------------
228+
xz : GPLv2+ and Public Domain
229+
----------------
162230
xz-devel : LGPLv2+
163231
----------------
164232
yarn : BSD
165233
----------------
234+
zip : BSD
235+
----------------
166236
ruby :https://www.ruby-lang.org/en/about/license.txt
167237
----------------
168238
python :https://docs.python.org/3/license.html

‎al/x86_64/standard/5.0/runtimes.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ runtimes:
8181
done
8282
golang:
8383
versions:
84+
1.23:
85+
commands:
86+
- echo "Installing Go version 1.23 ..."
87+
- goenv global $GOLANG_23_VERSION
8488
1.22:
8589
commands:
8690
- echo "Installing Go version 1.22 ..."
@@ -100,6 +104,10 @@ runtimes:
100104
- goenv global $VERSION
101105
python:
102106
versions:
107+
3.13:
108+
commands:
109+
- echo "Installing Python version 3.13 ..."
110+
- pyenv global $PYTHON_313_VERSION
103111
3.12:
104112
commands:
105113
- echo "Installing Python version 3.12 ..."
@@ -138,6 +146,10 @@ runtimes:
138146
- phpenv global $VERSION
139147
ruby:
140148
versions:
149+
3.4:
150+
commands:
151+
- echo "Installing Ruby version 3.4 ..."
152+
- rbenv global $RUBY_34_VERSION
141153
3.3:
142154
commands:
143155
- echo "Installing Ruby version 3.3 ..."
@@ -160,7 +172,7 @@ runtimes:
160172
22:
161173
commands:
162174
- echo "Installing Node.js version 22 ..."
163-
- n $NODE_22_VERSION
175+
- n $NODE_22_VERSION
164176
20:
165177
commands:
166178
- echo "Installing Node.js version 20 ..."
@@ -172,7 +184,7 @@ runtimes:
172184
default:
173185
commands:
174186
- echo "Installing custom Node.js version $VERSION ..."
175-
- n $VERSION && rm -rf /tmp/*
187+
- n --no-preserve $VERSION && rm -rf /tmp/*
176188
dotnet:
177189
versions:
178190
8.0:

‎al/x86_64/standard/corretto11/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@ COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh
121121
RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh
122122
COPY legal/bill_of_material.txt /usr/share/doc/bill_of_material.txt
123123

124-
ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"]
124+
ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"]

‎al/x86_64/standard/corretto11/dockerd-entrypoint.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
#!/bin/sh
22
set -e
3-
3+
4+
if [ "$CODEBUILD_GPU_BUILD" = "true" ]; then
5+
mkdir -p /etc/docker
6+
echo "{}" >> /etc/docker/daemon.json
7+
curl -s -L https://nvidia.github.io/libnvidia-container/stable/rpm/nvidia-container-toolkit.repo | tee /etc/yum.repos.d/nvidia-container-toolkit.repo
8+
yum install -y nvidia-container-toolkit
9+
nvidia-ctk runtime configure --runtime=docker
10+
export NVIDIA_VISIBLE_DEVICES=all
11+
export NVIDIA_DRIVER_CAPABILITIES=compute,utility
12+
fi
13+
414
/usr/local/bin/dockerd \
515
--host=unix:///var/run/docker.sock \
616
--host=tcp://127.0.0.1:2375 \
717
--storage-driver=overlay2 &>/var/log/docker.log &
8-
9-
18+
19+
1020
tries=0
1121
d_timeout=60
1222
until docker info >/dev/null 2>&1
@@ -19,5 +29,5 @@ do
1929
tries=$(( $tries + 1 ))
2030
sleep 1
2131
done
22-
32+
2333
eval "$@"

‎al/x86_64/standard/corretto8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@ COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh
121121
RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh
122122
COPY legal/bill_of_material.txt /usr/share/doc/bill_of_material.txt
123123

124-
ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"]
124+
ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"]

‎al/x86_64/standard/corretto8/dockerd-entrypoint.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
#!/bin/sh
22
set -e
3-
3+
4+
if [ "$CODEBUILD_GPU_BUILD" = "true" ]; then
5+
mkdir -p /etc/docker
6+
echo "{}" >> /etc/docker/daemon.json
7+
curl -s -L https://nvidia.github.io/libnvidia-container/stable/rpm/nvidia-container-toolkit.repo | tee /etc/yum.repos.d/nvidia-container-toolkit.repo
8+
yum install -y nvidia-container-toolkit
9+
nvidia-ctk runtime configure --runtime=docker
10+
export NVIDIA_VISIBLE_DEVICES=all
11+
export NVIDIA_DRIVER_CAPABILITIES=compute,utility
12+
fi
13+
414
/usr/local/bin/dockerd \
515
--host=unix:///var/run/docker.sock \
616
--host=tcp://127.0.0.1:2375 \
717
--storage-driver=overlay2 &>/var/log/docker.log &
8-
9-
18+
19+
1020
tries=0
1121
d_timeout=60
1222
until docker info >/dev/null 2>&1
@@ -19,5 +29,5 @@ do
1929
tries=$(( $tries + 1 ))
2030
sleep 1
2131
done
22-
32+
2333
eval "$@"

‎al/x86_64/standard/corretto8/runtimes.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ runtimes:
66
corretto8:
77
commands:
88
- echo "Installing corretto(OpenJDK) version 8 ..."
9-

0 commit comments

Comments
 (0)