Merge branch '98-fix-ubuntu-provisioning' into 'main'

Fix provisioning for Docker 23+ for some of the provisioners

Closes #98

See merge request https://gitlab.com/gitlab-org/ci-cd/docker-machine/-/merge_requests/102



Merged-by: Tomasz Maczukin <tomasz@maczukin.pl>
Approved-by: Axel von Bertoldi <avonbertoldi@gitlab.com>
Reviewed-by: Tomasz Maczukin <tomasz@maczukin.pl>

libmachine/provision/arch.go

@@ -133,7 +133,9 @@ func (provisioner *ArchProvisioner) Provision(swarmOptions swarm.Options, authOp
 		return err
 	}
 
-	provisioner.AuthOptions = setRemoteAuthOptions(provisioner)
+	if err := setupRemoteAuthOptions(provisioner); err != nil {
+		return err
+	}
 
 	log.Debug("Configuring auth")
 	if err := ConfigureAuth(provisioner); err != nil {

libmachine/provision/boot2docker.go

@@ -128,6 +128,10 @@ func (provisioner *Boot2DockerProvisioner) GetAuthOptions() auth.Options {
 	return provisioner.AuthOptions
 }
 
+func (provisioner *Boot2DockerProvisioner) SetAuthOptions(opts auth.Options) {
+	provisioner.AuthOptions = opts
+}
+
 func (provisioner *Boot2DockerProvisioner) GetSwarmOptions() swarm.Options {
 	return provisioner.SwarmOptions
 }
@@ -245,12 +249,10 @@ func (provisioner *Boot2DockerProvisioner) Provision(swarmOptions swarm.Options,
 		return err
 	}
 
-	if err = makeDockerOptionsDir(provisioner); err != nil {
+	if err := setupRemoteAuthOptions(provisioner); err != nil {
 		return err
 	}
 
-	provisioner.AuthOptions = setRemoteAuthOptions(provisioner)
-
 	if err = ConfigureAuth(provisioner); err != nil {
 		return err
 	}

libmachine/provision/coreos.go

@@ -118,13 +118,10 @@ func (provisioner *CoreOSProvisioner) Provision(swarmOptions swarm.Options, auth
 		return err
 	}
 
-	if err := makeDockerOptionsDir(provisioner); err != nil {
+	if err := setupRemoteAuthOptions(provisioner); err != nil {
 		return err
 	}
 
-	log.Debugf("Preparing certificates")
-	provisioner.AuthOptions = setRemoteAuthOptions(provisioner)
-
 	log.Debugf("Setting up certificates")
 	if err := ConfigureAuth(provisioner); err != nil {
 		return err

libmachine/provision/debian.go

@@ -120,7 +120,9 @@ func (provisioner *DebianProvisioner) Provision(swarmOptions swarm.Options, auth
 		return err
 	}
 
-	provisioner.AuthOptions = setRemoteAuthOptions(provisioner)
+	if err := setupRemoteAuthOptions(provisioner); err != nil {
+		return err
+	}
 
 	log.Debug("configuring auth")
 	if err := ConfigureAuth(provisioner); err != nil {

libmachine/provision/fake_provisioner.go

@@ -43,6 +43,8 @@ func (fp *FakeProvisioner) GetAuthOptions() auth.Options {
 	return auth.Options{}
 }
 
+func (fp *FakeProvisioner) SetAuthOptions(opts auth.Options) {}
+
 func (fp *FakeProvisioner) GetSwarmOptions() swarm.Options {
 	return swarm.Options{}
 }

libmachine/provision/generic.go

@@ -64,6 +64,10 @@ func (provisioner *GenericProvisioner) SetHostname(hostname string) error {
 	return nil
 }
 
+func (provisioner *GenericProvisioner) SetAuthOptions(opts auth.Options) {
+	provisioner.AuthOptions = opts
+}
+
 func (provisioner *GenericProvisioner) GetDockerOptionsDir() string {
 	return provisioner.DockerOptionsDir
 }

libmachine/provision/google_cos.go

@@ -89,8 +89,9 @@ func (p *GoogleCOSProvisioner) Provision(swarmOptions swarm.Options, authOptions
 		return err
 	}
 
-	log.Debugf("Preparing remote auth options")
-	p.AuthOptions = setRemoteAuthOptions(p)
+	if err := setupRemoteAuthOptions(p); err != nil {
+		return err
+	}
 
 	log.Debug("Configuring auth")
 	err = ConfigureAuth(p)

libmachine/provision/provisioner.go

@@ -50,6 +50,9 @@ type Provisioner interface {
 	// Return the auth options used to configure remote connection for the daemon.
 	GetAuthOptions() auth.Options
 
+	// Set auth options used to configure remote connection for the daemon.
+	SetAuthOptions(opts auth.Options)
+
 	// Get the swarm options associated with this host.
 	GetSwarmOptions() swarm.Options
 

libmachine/provision/rancheros.go

@@ -127,8 +127,9 @@ func (provisioner *RancherProvisioner) Provision(swarmOptions swarm.Options, aut
 		}
 	}
 
-	log.Debugf("Preparing certificates")
-	provisioner.AuthOptions = setRemoteAuthOptions(provisioner)
+	if err := setupRemoteAuthOptions(provisioner); err != nil {
+		return err
+	}
 
 	log.Debugf("Setting up certificates")
 	if err := ConfigureAuth(provisioner); err != nil {

libmachine/provision/redhat.go

@@ -165,12 +165,10 @@ func (provisioner *RedHatProvisioner) Provision(swarmOptions swarm.Options, auth
 		return err
 	}
 
-	if err := makeDockerOptionsDir(provisioner); err != nil {
+	if err := setupRemoteAuthOptions(provisioner); err != nil {
 		return err
 	}
 
-	provisioner.AuthOptions = setRemoteAuthOptions(provisioner)
-
 	if err := ConfigureAuth(provisioner); err != nil {
 		return err
 	}

libmachine/provision/suse.go

@@ -176,7 +176,9 @@ func (provisioner *SUSEProvisioner) Provision(swarmOptions swarm.Options, authOp
 		return err
 	}
 
-	provisioner.AuthOptions = setRemoteAuthOptions(provisioner)
+	if err := setupRemoteAuthOptions(provisioner); err != nil {
+		return err
+	}
 
 	log.Debug("Configuring auth")
 	if err := ConfigureAuth(provisioner); err != nil {

libmachine/provision/ubuntu_systemd.go

@@ -130,7 +130,9 @@ func (provisioner *UbuntuSystemdProvisioner) Provision(swarmOptions swarm.Option
 		return err
 	}
 
-	provisioner.AuthOptions = setRemoteAuthOptions(provisioner)
+	if err := setupRemoteAuthOptions(provisioner); err != nil {
+		return err
+	}
 
 	log.Debug("configuring auth")
 	if err := ConfigureAuth(provisioner); err != nil {

libmachine/provision/ubuntu_upstart.go

@@ -143,12 +143,10 @@ func (provisioner *UbuntuProvisioner) Provision(swarmOptions swarm.Options, auth
 		return err
 	}
 
-	if err := makeDockerOptionsDir(provisioner); err != nil {
+	if err := setupRemoteAuthOptions(provisioner); err != nil {
 		return err
 	}
 
-	provisioner.AuthOptions = setRemoteAuthOptions(provisioner)
-
 	if err := ConfigureAuth(provisioner); err != nil {
 		return err
 	}

libmachine/provision/utils.go

@@ -34,7 +34,20 @@ func installDockerGeneric(p Provisioner, baseURL string) error {
 	return nil
 }
 
+func setupRemoteAuthOptions(p Provisioner) error {
+	err := makeDockerOptionsDir(p)
+	if err != nil {
+		return fmt.Errorf("(re)creating /etc/docker directory: %v", err)
+	}
+
+	p.SetAuthOptions(setRemoteAuthOptions(p))
+
+	return nil
+}
+
 func makeDockerOptionsDir(p Provisioner) error {
+	log.Debugf("(Re)creating /etc/docker if needed")
+
 	dockerDir := p.GetDockerOptionsDir()
 	if _, err := p.SSHCommand(fmt.Sprintf("sudo mkdir -p %s", dockerDir)); err != nil {
 		return err
@@ -44,6 +57,8 @@ func makeDockerOptionsDir(p Provisioner) error {
 }
 
 func setRemoteAuthOptions(p Provisioner) auth.Options {
+	log.Debugf("Preparing certificates")
+
 	dockerDir := p.GetDockerOptionsDir()
 	authOptions := p.GetAuthOptions()