Merge branch 'master' into aidan/k8s1.29_upgrade

crio.Dockerfile

@@ -53,7 +53,7 @@ run --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
 <<DKR
   git clone \
-    --branch v1.22-sysbox \
+    --branch v1.28-sysbox \
     --depth 1 \
     --shallow-submodules \
     https://github.com/nestybox/cri-o.git \

sysbox-eks.pkr.hcl

@@ -112,6 +112,22 @@ build {
     ]
   }
 
+
+  provisioner "shell" {
+    inline_shebang = "/usr/bin/env bash"
+    inline = [
+      "set -o pipefail -o errexit",
+
+      "echo '>>> Installing latch'",
+      "curl --location --fail --remote-name https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh",
+      "sudo bash Mambaforge-Linux-x86_64.sh -b -p /opt/mamba -u",
+      "rm Mambaforge-Linux-x86_64.sh",
+
+      "sudo /opt/mamba/bin/mamba create --copy -y -p /opt/latch-env python=3.11",
+      "sudo /opt/latch-env/bin/pip install latch==2.47.7"
+    ]
+  }
+
   provisioner "shell" {
     inline_shebang = "/usr/bin/env bash"
     inline = [
@@ -386,4 +402,5 @@ build {
       "sudo dasel put string --parser toml --selector 'nvidia-container-runtime.runtimes.[]' --file /etc/nvidia-container-runtime/config.toml 'runc'"
     ]
   }
+
 }

systemd/system/sysbox-fs.service

@@ -6,7 +6,7 @@ After=sysbox-mgr.service
 [Service]
 Type=simple
 Type=notify
-ExecStart=/bin/sh -c "/usr/bin/sysbox-fs --log /var/log/sysbox/sysbox-fs.txt"
+ExecStart=/usr/bin/sysbox-fs --log /var/log/sysbox/sysbox-fs.txt
 Restart=always
 TimeoutStartSec=10
 TimeoutStopSec=10