feat(cmd/gitlab_ci/setup_runner): Add flag --no-docker-socket

sikalabs · May 28, 2024 · 0367c63 · 0367c63
1 parent aa39de8
commit 0367c63
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/cmd/gitlab_ci/setup_runner/setup_runner.go b/cmd/gitlab_ci/setup_runner/setup_runner.go
@@ -16,6 +16,7 @@ var FlagToken string
 var FlagGitlabName string
 var FlagConcurrency int
 var FlagDryRun bool
+var FlagDontForwardDockerSocket bool
 
 var Cmd = &cobra.Command{
 	Use:     "setup-runner",
@@ -43,7 +44,7 @@ var Cmd = &cobra.Command{
 			log.Fatal("flags gitlab-url and registration-token OR flag gitlab (for Vault) are required")
 		}
 
-		err = setup_runner_utils.SetupGitlabRunnerDocker(gitlabUrl, token, hostname, FlagConcurrency, FlagDryRun)
+		err = setup_runner_utils.SetupGitlabRunnerDocker(gitlabUrl, token, hostname, FlagConcurrency, !FlagDontForwardDockerSocket, FlagDryRun)
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -88,4 +89,10 @@ func init() {
 		false,
 		"Print the command instead of executing it",
 	)
+	Cmd.PersistentFlags().BoolVar(
+		&FlagDontForwardDockerSocket,
+		"no-docker-socket",
+		false,
+		"Don't forward docker socket",
+	)
 }
diff --git a/utils/gitlab_ci_utils/setup_runner_utils/setup_runner_utils_docker.go b/utils/gitlab_ci_utils/setup_runner_utils/setup_runner_utils_docker.go
@@ -8,7 +8,7 @@ import (
 	"github.com/sikalabs/slu/utils/exec_utils"
 )
 
-func SetupGitlabRunnerDocker(gitlabUrl, token, hostname string, concurrency int, dryRun bool) error {
+func SetupGitlabRunnerDocker(gitlabUrl, token, hostname string, concurrency int, forwardDockerSocket, dryRun bool) error {
 	var err error
 	var args []string
 
@@ -59,7 +59,9 @@ func SetupGitlabRunnerDocker(gitlabUrl, token, hostname string, concurrency int,
 		"--docker-image", "docker:git",
 		"--docker-volumes", etcVolume,
 		"--docker-volumes", buildsVolume,
-		"--docker-volumes", "/var/run/docker.sock:/var/run/docker.sock",
+	}
+	if forwardDockerSocket {
+		args = append(args, "--docker-volumes", "/var/run/docker.sock:/var/run/docker.sock")
 	}
 	if dryRun {
 		printCommand("docker", args)