Skip to content

Commit

Permalink
Do not relocate the mounted docker.sock (argoproj#1607)
Browse files Browse the repository at this point in the history
The mount path of the docker.sock should not depend on the host path of the docker.sock
  • Loading branch information
jw3 authored and sarabala1979 committed Sep 19, 2019
1 parent 1bd50fa commit e9f3d9c
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions workflow/controller/workflowpod.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,9 @@ var (
)

func (woc *wfOperationCtx) getVolumeMountDockerSock() apiv1.VolumeMount {
dockerSockPath := "/var/run/docker.sock"

if woc.controller.Config.DockerSockPath != "" {
dockerSockPath = woc.controller.Config.DockerSockPath
}

return apiv1.VolumeMount{
Name: common.DockerSockVolumeName,
MountPath: dockerSockPath,
MountPath: "/var/run/docker.sock",
ReadOnly: true,
}
}
Expand Down

0 comments on commit e9f3d9c

Please sign in to comment.