Skip to content

Commit f697e72

Browse files
committed
Add LIMA_INSTALL_TINI option
`nerdctl run --init` and `nerdctl compose --init` need tini to run as the init process inside the container. Signed-off-by: Jan Dubois <[email protected]>
1 parent 88bd124 commit f697e72

File tree

4 files changed

+9
-0
lines changed

4 files changed

+9
-0
lines changed

edition/min

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ export LIMA_INSTALL_LOGROTATE=false
1616
export LIMA_INSTALL_NERDCTL_FULL=false
1717
export LIMA_INSTALL_OPENSSH_SFTP_SERVER=false
1818
export LIMA_INSTALL_SSHFS=false
19+
export LIMA_INSTALL_TINI=false
1920
export LIMA_INSTALL_ZSTD=false

edition/std

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ LIMA_INSTALL_IPTABLES=true
99
LIMA_INSTALL_LOGROTATE=true
1010
LIMA_INSTALL_OPENSSH_SFTP_SERVER=true
1111
LIMA_INSTALL_SSHFS=true
12+
LIMA_INSTALL_TINI=true

genapkovl-lima.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,10 @@ if [ "${LIMA_INSTALL_ZSTD}" == "true" ]; then
277277
echo "zstd" >> "$tmp"/etc/apk/world
278278
fi
279279

280+
if [ "${LIMA_INSTALL_TINI}" == "true" ]; then
281+
echo "tini" >> "$tmp"/etc/apk/world
282+
fi
283+
280284
if [ "${LIMA_INSTALL_CRI_DOCKERD}" == "true" ]; then
281285
mkdir -p "${tmp}/cri-dockerd"
282286
tar xz -C "${tmp}/cri-dockerd" -f /home/build/cri-dockerd.tar.gz

mkimg.lima.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ profile_lima() {
5858
if [ "${LIMA_INSTALL_SSHFS}" == "true" ]; then
5959
apks="$apks sshfs"
6060
fi
61+
if [ "${LIMA_INSTALL_TINI}" == "true" ]; then
62+
apks="$apks tini"
63+
fi
6164
if [ "${LIMA_INSTALL_IPTABLES}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
6265
apks="$apks iptables ip6tables"
6366
fi

0 commit comments

Comments
 (0)