Skip to content

Commit 4230828

Browse files
committed
We need tini-static for nerdctl run --init
The regular `tini` binary is linked against musl, so won't work in non-Alpine containers. lima-std:~# ldd /sbin/tini /lib/ld-musl-x86_64.so.1 (0x7f32fea7c000) libc.musl-x86_64.so.1 => /lib/ld-musl-x86_64.so.1 (0x7f32fea7c000) Signed-off-by: Jan Dubois <[email protected]>
1 parent b4b6d8a commit 4230828

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

genapkovl-lima.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ if [ "${LIMA_INSTALL_ZSTD}" == "true" ]; then
278278
fi
279279

280280
if [ "${LIMA_INSTALL_TINI}" == "true" ]; then
281-
echo "tini" >> "$tmp"/etc/apk/world
281+
echo tini-static >> "$tmp"/etc/apk/world
282+
ln -sf /sbin/tini-static "$tmp"/usr/bin/tini
282283
fi
283284

284285
if [ "${LIMA_INSTALL_CRI_DOCKERD}" == "true" ]; then

mkimg.lima.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ profile_lima() {
5959
apks="$apks sshfs"
6060
fi
6161
if [ "${LIMA_INSTALL_TINI}" == "true" ]; then
62-
apks="$apks tini"
62+
apks="$apks tini-static"
6363
fi
6464
if [ "${LIMA_INSTALL_IPTABLES}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
6565
apks="$apks iptables ip6tables"

0 commit comments

Comments
 (0)