trying to find a workaround to spire not supporting cgroupv2

CSCfi · Mar 21, 2024 · def9ea0 · def9ea0
1 parent b83f951
commit def9ea0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/client/container_preparation/entrypoint.sh b/client/container_preparation/entrypoint.sh
@@ -73,7 +73,7 @@ if [ -n "$encrypted" ]; then
 fi
 
 
-ps -p $spire_agent_pid > /dev/null || ( echo "spire agent died, aborting" ; end_entrypoint "$spire_agent_pid" 1)
+ps $spire_agent_pid > /dev/null || ( echo "spire agent died, aborting" ; end_entrypoint "$spire_agent_pid" 1)
 
 #
 ## [END] Perform node attestation

diff --git a/server/tools/digests b/server/tools/digests
@@ -1,2 +1,3 @@
-lumi-sd/data_prep:latest
-sd-container/client:latest
+ghcr.io/cscfi/hpcs/data-prep:dockerfile_everywhere
+ghcr.io/cscfi/hpcs/container-prep:dockerfile_everywhere
+ghcr.io/cscfi/hpcs/job-prep:dockerfile_everywhere
diff --git a/utils/agent-on-the-fly.conf b/utils/agent-on-the-fly.conf
@@ -24,7 +24,12 @@ plugins {
     }
 
     WorkloadAttestor "unix" {
-        plugin_data {}
+        plugin_data {
+            discover_workload_path = true
+        }
+    }
+
+    WorkloadAttestor "systemd" {
     }
 
     WorkloadAttestor "docker" {
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,7 @@ if [ -n "$encrypted" ]; then @@
     fi
-    ps -p $spire_agent_pid > /dev/null || ( echo "spire agent died, aborting" ; end_entrypoint "$spire_agent_pid" 1)
+    ps $spire_agent_pid > /dev/null || ( echo "spire agent died, aborting" ; end_entrypoint "$spire_agent_pid" 1)
     #
     ## [END] Perform node attestation
@@ Expand Down @@