From e03a565afefc6c2d129dab20d6561aa61dae0d4b Mon Sep 17 00:00:00 2001 From: Fio Cobbs Date: Thu, 29 May 2025 16:40:30 -0500 Subject: [PATCH] fix: apply --container-daemon-socket correctly Removes the default docker.sock entry, as our soft-fork of act shouldn't need an explicit reference. It also makes logs say a Docker socket is being used, although this logging seems to not actually reflect what's being displayed. Fixes #577 --- internal/app/cmd/exec.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/app/cmd/exec.go b/internal/app/cmd/exec.go index 404f4aea..fd31970d 100644 --- a/internal/app/cmd/exec.go +++ b/internal/app/cmd/exec.go @@ -476,7 +476,7 @@ func loadExecCmd(ctx context.Context) *cobra.Command { execCmd.Flags().BoolVar(&execArg.privileged, "privileged", false, "use privileged mode") execCmd.Flags().StringVar(&execArg.usernsMode, "userns", "", "user namespace to use") execCmd.PersistentFlags().StringVarP(&execArg.containerArchitecture, "container-architecture", "", "", "Architecture which should be used to run containers, e.g.: linux/amd64. If not specified, will use host default architecture. Requires Docker server API Version 1.41+. Ignored on earlier Docker server platforms.") - execCmd.PersistentFlags().StringVarP(&execArg.containerDaemonSocket, "container-daemon-socket", "", "/var/run/docker.sock", "Path to Docker daemon socket which will be mounted to containers") + execCmd.PersistentFlags().StringVarP(&execArg.containerDaemonSocket, "container-daemon-socket", "", "", "Path to Docker daemon socket which will be mounted to containers (e.g.: /var/run/docker.sock). If not specified or invalid, will scan the system for common socket paths.") execCmd.Flags().BoolVar(&execArg.useGitIgnore, "use-gitignore", true, "Controls whether paths specified in .gitignore should be copied into container") execCmd.Flags().StringArrayVarP(&execArg.containerCapAdd, "container-cap-add", "", []string{}, "kernel capabilities to add to the workflow containers (e.g. --container-cap-add SYS_PTRACE)") execCmd.Flags().StringArrayVarP(&execArg.containerCapDrop, "container-cap-drop", "", []string{}, "kernel capabilities to remove from the workflow containers (e.g. --container-cap-drop SYS_PTRACE)")