Skip to content

Commit 28e8b56

Browse files
committed
fix: fix cgroups
1 parent e9ecaf5 commit 28e8b56

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

run.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,15 @@ do
187187
fi
188188

189189
echo "Starting dockerd"
190-
dockerd --cgroup-parent "docker" ${DOCKERD_PARAMS} <&- &
190+
if [[ "$(stat -fc %T /sys/fs/cgroup/)" == "tmpfs" ]]; then
191+
echo "Using cgroup v1"
192+
dockerd ${DOCKERD_PARAMS} <&- &
193+
else
194+
echo "Using cgroup v2"
195+
CURRENT_CGROUP=$(cat /proc/self/cgroup | sed 's/0:://')
196+
echo "Current cgroup: ${CURRENT_CGROUP}"
197+
dockerd --cgroup-parent "${CURRENT_CGROUP}/docker"
198+
fi
191199
echo "Waiting at most 20s for docker pid"
192200
CNT=0
193201
while ! test -f "${DOCKERD_PID_FILE}" || test -z "$(cat ${DOCKERD_PID_FILE})"

0 commit comments

Comments
 (0)