Merge branch 'main' of github.com:abiosoft/alpine-lima into colima

edition/min

@@ -16,4 +16,5 @@ export LIMA_INSTALL_LOGROTATE=false
 export LIMA_INSTALL_NERDCTL_FULL=false
 export LIMA_INSTALL_OPENSSH_SFTP_SERVER=false
 export LIMA_INSTALL_SSHFS=false
+export LIMA_INSTALL_TINI=false
 export LIMA_INSTALL_ZSTD=false

edition/std

@@ -9,3 +9,4 @@ LIMA_INSTALL_IPTABLES=true
 LIMA_INSTALL_LOGROTATE=true
 LIMA_INSTALL_OPENSSH_SFTP_SERVER=true
 LIMA_INSTALL_SSHFS=true
+LIMA_INSTALL_TINI=true

genapkovl-lima.sh

@@ -289,6 +289,11 @@ if [ "${LIMA_INSTALL_ZSTD}" == "true" ]; then
  echo "zstd" >>"$tmp"/etc/apk/world
 fi
 
+if [ "${LIMA_INSTALL_TINI}" == "true" ]; then
+ echo tini-static >> "$tmp"/etc/apk/world
+ ln -sf /sbin/tini-static "$tmp"/usr/bin/tini
+fi
+
 if [ "${LIMA_INSTALL_CRI_DOCKERD}" == "true" ]; then
  mkdir -p "${tmp}/cri-dockerd"
  tar xz -C "${tmp}/cri-dockerd" -f /home/build/cri-dockerd.tar.gz

mkimg.lima.sh

@@ -6,65 +6,65 @@ profile_lima() {
  Slimmed down kernel.
  Optimized for virtual systems.
  Configured for lima."
- arch="aarch64 x86 x86_64"
- initfs_cmdline="modules=loop,squashfs,sd-mod,usb-storage"
- kernel_addons=
- kernel_flavors="virt"
- kernel_cmdline="console=hvc0 console=tty0 console=ttyS0,115200"
- syslinux_serial="0 115200"
- apkovl="genapkovl-lima.sh"
- apks="$apks openssh-server-pam"
- if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
- apks="$apks ca-certificates"
- fi
- if [ "${LIMA_INSTALL_CLOUD_INIT}" == "true" ]; then
- apks="$apks cloud-init"
- fi
- if [ "${LIMA_INSTALL_CLOUD_UTILS_GROWPART}" == "true" ]; then
- apks="$apks cloud-utils-growpart partx"
- fi
- if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
- apks="$apks cni-plugins"
- fi
- if [ "${LIMA_INSTALL_CNI_PLUGIN_FLANNEL}" == "true" ]; then
- apks="$apks cni-plugin-flannel"
- fi
- if [ "${LIMA_INSTALL_CURL}" == "true" ]; then
- apks="$apks curl"
- fi
- if [ "${LIMA_INSTALL_E2FSPROGS_EXTRA}" == "true" ]; then
- apks="$apks e2fsprogs-extra"
- fi
- if [ "${LIMA_INSTALL_GIT}" == "true" ]; then
- apks="$apks git"
- fi
- if [ "${LIMA_INSTALL_DOCKER}" == "true" ]; then
- apks="$apks libseccomp runc containerd tini-static device-mapper-libs"
- apks="$apks docker-engine docker-openrc docker-cli docker"
- apks="$apks socat xz"
- fi
- if [ "${LIMA_INSTALL_LIMA_INIT}" == "true" ]; then
- apks="$apks e2fsprogs lsblk sfdisk shadow sudo udev"
- fi
- if [ "${LIMA_INSTALL_K3S}" == "true" ]; then
- apks="$apks k3s"
- fi
- if [ "${LIMA_INSTALL_LOGROTATE}" == "true" ]; then
- apks="$apks logrotate"
- fi
- if [ "${LIMA_INSTALL_OPENSSH_SFTP_SERVER=true}" == "true" ]; then
- apks="$apks openssh-sftp-server"
- fi
- if [ "${LIMA_INSTALL_SSHFS}" == "true" ]; then
- apks="$apks sshfs"
- fi
- if [ "${LIMA_INSTALL_IPTABLES}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
- apks="$apks iptables ip6tables"
- fi
- if [ "${LIMA_INSTALL_ZSTD}" == "true" ]; then
- apks="$apks zstd"
- fi
- if [ "${LIMA_INSTALL_FSTRIM}" == "true" ]; then
- apks="$apks fstrim"
- fi
+ arch="aarch64 x86 x86_64"
+ initfs_cmdline="modules=loop,squashfs,sd-mod,usb-storage"
+ kernel_addons=
+ kernel_flavors="virt"
+ kernel_cmdline="console=hvc0 console=tty0 console=ttyS0,115200"
+ syslinux_serial="0 115200"
+ apkovl="genapkovl-lima.sh"
+ apks="$apks openssh-server-pam"
+  if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
+  apks="$apks ca-certificates"
+  fi
+  if [ "${LIMA_INSTALL_CLOUD_INIT}" == "true" ]; then
+  apks="$apks cloud-init"
+  fi
+  if [ "${LIMA_INSTALL_CLOUD_UTILS_GROWPART}" == "true" ]; then
+  apks="$apks cloud-utils-growpart partx"
+  fi
+  if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
+  apks="$apks cni-plugins"
+  fi
+  if [ "${LIMA_INSTALL_CNI_PLUGIN_FLANNEL}" == "true" ]; then
+  apks="$apks cni-plugin-flannel"
+  fi
+  if [ "${LIMA_INSTALL_CURL}" == "true" ]; then
+  apks="$apks curl"
+  fi
+  if [ "${LIMA_INSTALL_E2FSPROGS_EXTRA}" == "true" ]; then
+  apks="$apks e2fsprogs-extra"
+  fi
+  if [ "${LIMA_INSTALL_GIT}" == "true" ]; then
+  apks="$apks git"
+  fi
+  if [ "${LIMA_INSTALL_DOCKER}" == "true" ]; then
+  apks="$apks libseccomp runc containerd tini-static device-mapper-libs"
+  apks="$apks docker-engine docker-openrc docker-cli docker"
+  apks="$apks socat xz"
+  fi
+  if [ "${LIMA_INSTALL_LIMA_INIT}" == "true" ]; then
+  apks="$apks e2fsprogs lsblk sfdisk shadow sudo udev"
+  fi
+  if [ "${LIMA_INSTALL_K3S}" == "true" ]; then
+  apks="$apks k3s"
+  fi
+  if [ "${LIMA_INSTALL_LOGROTATE}" == "true" ]; then
+  apks="$apks logrotate"
+  fi
+  if [ "${LIMA_INSTALL_OPENSSH_SFTP_SERVER=true}" == "true" ]; then
+  apks="$apks openssh-sftp-server"
+  fi
+  if [ "${LIMA_INSTALL_SSHFS}" == "true" ]; then
+  apks="$apks sshfs"
+  fi
+  if [ "${LIMA_INSTALL_TINI}" == "true" ]; then
+  apks="$apks tini-static"
+  fi
+  if [ "${LIMA_INSTALL_IPTABLES}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
+  apks="$apks iptables ip6tables"
+  fi
+  if [ "${LIMA_INSTALL_ZSTD}" == "true" ]; then
+  apks="$apks zstd"
+  fi
 }