Make sure not to treat the instance as a docker host always, as it might

not be one.

pwd/check_swarm_status_task.go

@@ -10,6 +10,9 @@ type checkSwarmStatusTask struct {
 }
 
 func (c checkSwarmStatusTask) Run(i *Instance) error {
+	if i.docker == nil {
+		return nil
+	}
 	if info, err := i.docker.GetDaemonInfo(); err == nil {
 		if info.Swarm.LocalNodeState != swarm.LocalNodeStateInactive && info.Swarm.LocalNodeState != swarm.LocalNodeStateLocked {
 			i.IsManager = &info.Swarm.ControlAvailable

pwd/check_swarm_used_ports.go

@@ -9,6 +9,9 @@ type checkSwarmUsedPortsTask struct {
 }
 
 func (c checkSwarmUsedPortsTask) Run(i *Instance) error {
+	if i.docker == nil {
+		return nil
+	}
 	if i.IsManager != nil && *i.IsManager {
 		sessionPrefix := i.session.Id[:8]
 		// This is a swarm manager instance, then check for ports

pwd/check_used_ports_task.go

@@ -6,6 +6,9 @@ type checkUsedPortsTask struct {
 }
 
 func (c checkUsedPortsTask) Run(i *Instance) error {
+	if i.docker == nil {
+		return nil
+	}
 	if ports, err := i.docker.GetPorts(); err == nil {
 		for _, p := range ports {
 			i.setUsedPort(uint16(p))

pwd/instance.go

@@ -48,6 +48,7 @@ type Instance struct {
 	CACert       []byte           `json:"ca_cert"`
 	Cert         []byte           `json:"cert"`
 	Key          []byte           `json:"key"`
+	IsDockerHost bool             `json:"is_docker_host"`
 	session      *Session         `json:"-"`
 	conn         net.Conn         `json:"-"`
 	ctx          context.Context  `json:"-"`
@@ -236,6 +237,8 @@ func (p *pwd) InstanceNew(session *Session, conf InstanceConfig) (*Instance, err
 	instance.ServerKey = conf.ServerKey
 	instance.CACert = conf.CACert
 	instance.session = session
+	// For now this condition holds through. In the future we might need a more complex logic.
+	instance.IsDockerHost = opts.Privileged
 
 	if session.Instances == nil {
 		session.Instances = make(map[string]*Instance)

pwd/instance_test.go

@@ -66,6 +66,7 @@ func TestInstanceNew(t *testing.T) {
 		IP:           "10.0.0.1",
 		Alias:        "",
 		Image:        config.GetDindImageName(),
+		IsDockerHost: true,
 		session:      session,
 	}
 
@@ -113,6 +114,7 @@ func TestInstanceNew_WithNotAllowedImage(t *testing.T) {
 		IP:           "10.0.0.1",
 		Alias:        "",
 		Image:        "redis",
+		IsDockerHost: false,
 		session:      session,
 	}
 

pwd/tasks.go

@@ -45,7 +45,7 @@ func (sch *scheduler) Schedule(s *Session) {
 			wg.Add(len(s.Instances))
 			for _, ins := range s.Instances {
 				var i *Instance = ins
-				if i.docker == nil {
+				if i.docker == nil && i.IsDockerHost {
 					// Need to create client to the DinD docker daemon
 
 					// We check if the client needs to use TLS