From 2c5a8eda24132cef40fd19dd1476b474aa6f3b88 Mon Sep 17 00:00:00 2001 From: Roman Vanicek Date: Wed, 20 Nov 2024 21:54:59 +0100 Subject: [PATCH] Built-in docker can be disabled --- entrypoint.sh | 2 ++ supervisord.conf | 2 ++ 2 files changed, 4 insertions(+) diff --git a/entrypoint.sh b/entrypoint.sh index 7cce9af..d49fc56 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -12,6 +12,7 @@ CODE_GUID="${CODE_GUID:-1001}" CODE_USERNAME=$(getent passwd "$CODE_UUID" | cut -d: -f1) CODE_GROUPNAME=$(getent group "$CODE_GUID" | cut -d: -f1) USER_SUDO="${USER_SUDO:-false}" +RUN_DOCKER="${RUN_DOCKER:-true}" #GIT_NAME #GIT_EMAIL @@ -71,6 +72,7 @@ else fi export CODE_USERNAME +export RUN_DOCKER cd /home/code exec "$@" \ No newline at end of file diff --git a/supervisord.conf b/supervisord.conf index 08571f7..4746411 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -27,9 +27,11 @@ command = /usr/sbin/sshd -D [program:containerd] command = /usr/bin/containerd +autostart = %(ENV_RUN_DOCKER)s [program:dockerd] command = /usr/bin/dockerd --containerd=/run/containerd/containerd.sock +autostart = %(ENV_RUN_DOCKER)s #[program:code] #command = /usr/bin/code serve-web --host 0.0.0.0 --port 80