diff --git a/act-runner/cgroup-helper.sh b/act-runner/cgroup-helper.sh index 1d94e4b..dad34dd 100755 --- a/act-runner/cgroup-helper.sh +++ b/act-runner/cgroup-helper.sh @@ -2,11 +2,11 @@ # This file needs to be source'ed and the function join_cgroup called, by any script that goes on to run kind # This is required due to issues with properly virtualizing the cgroup hierarchy that exist at present in docker # See: https://github.com/earthly/earthly/blob/main/buildkitd/dockerd-wrapper.sh#L56 -function configure_cgropup() { +function configure_cgroup() { if [ -f "/sys/fs/cgroup/cgroup.controllers" ]; then - echo >&2 "detected cgroups v2" + echo >&2 "INFO: detected cgroup v2, configuring nested docker group" - local cgroup_name = "nested-dockerd" # NOTE: has to be the same as the function below (local var to prevent overriding in the caller) + local cgroup_name="nested-dockerd" # NOTE: has to be the same as the function below (local var to prevent overriding in the caller) # move script to separate cgroup, to prevent the root cgroup from becoming threaded (which will prevent systemd images (e.g. kind) from running) mkdir /sys/fs/cgroup/${cgroup_name} @@ -29,6 +29,6 @@ function configure_cgropup() { } function join_cgroup() { - local cgroup_name = "nested-dockerd" # NOTE: has to be the same as the function above (local var to prevent overriding in the caller) + local cgroup_name="nested-dockerd" # NOTE: has to be the same as the function above (local var to prevent overriding in the caller) echo $$ > /sys/fs/cgroup/${cgroup_name}/cgroup.procs }