Merge pull request #167 from thedadams/more-rancher-cert-fixes

More rancher cert fixes

Author: thedadams

commands/create.go

@@ -539,20 +539,22 @@ func updateUserdataFile(driverOpts *rpcdriver.RPCFlags, machineName, userdataFla
 // writeCloudConfig sets custom install script path to the runcmd directive
 // and passes the script path to commonCloudConfig
 func writeCloudConfig(machineName, encodedData, machineOS string, cf map[interface{}]interface{}, newUserDataFile *os.File) error {
-	command := "sh /usr/local/custom_script/install.sh"
+	command := "sh"
+	path := "/usr/local/custom_script/install.sh"
 	if strings.Contains(machineOS, "windows") {
 		// the writeFile path should ideally be C:\usr\local\custom_script\install.ps1
 		// but we can't guarantee that directory exists or can be created on the target machine
-		command = "powershell C:\\install.ps1"
+		command = "powershell"
+		path = "C:\\install.ps1"
 	}
-	return commonCloudConfig(machineName, machineOS, encodedData, command, cf, newUserDataFile)
+	return commonCloudConfig(machineName, machineOS, encodedData, command, path, cf, newUserDataFile)
 }
 
 // commonCloudConfig contains the shared cloud-config logic for writeCloudConfig
 // it adds content to the write_files directive of the cloud-config file as well as sets the hostname
 // the content added is based on the OS passed with a hard default to linux
 // windows is the only other supported OS
-func commonCloudConfig(machineName, machineOS, encodedData, command string, cf map[interface{}]interface{}, newUserDataFile *os.File) error {
+func commonCloudConfig(machineName, machineOS, encodedData, command, path string, cf map[interface{}]interface{}, newUserDataFile *os.File) error {
 	writeFile := map[string]string{
 		"encoding":    "gzip+b64",
 		"content":     fmt.Sprintf("%s", encodedData),
@@ -564,7 +566,7 @@ func commonCloudConfig(machineName, machineOS, encodedData, command string, cf m
 	}
 
 	// Add to the runcmd directive
-	if err := addToCloudConfig(cf, "runcmd", fmt.Sprintf("%s", writeFile["path"])); err != nil {
+	if err := addToCloudConfig(cf, "runcmd", fmt.Sprintf("%s %s", command, writeFile["path"])); err != nil {
 		return err
 	}
 

package/download_driver.sh

@@ -2,6 +2,16 @@
 
 driver_prefix=docker-machine-driver-
 
+if [ -n "${SSL_CERT_DIR}" ]; then
+  ln -s /etc/ssl/certs/* "${SSL_CERT_DIR}"
+fi
+
+if [ -x "$(command -v c_rehash)" ]; then
+  # c_rehash is run here instead of update-ca-certificates because the latter requires root privileges
+  # and the rancher-machine container is run as non-root user.
+  c_rehash
+fi
+
 curl -sLO "$1"
 driver_file=$(ls $driver_prefix*)
 driver_name=$(echo "$driver_file" | sed -e "s/^$driver_prefix//" -e "s/[-_\.].*$//")
@@ -39,4 +49,4 @@ fi
 
 chmod +x $driver_path
 mv $driver_path /usr/local/bin/$driver_prefix$driver_name
-rm -rf driver_dir $driver_file $driver_path
+rm -rf driver_dir $driver_file $driver_path

package/entrypoint.sh

@@ -2,12 +2,6 @@
 set -e
 termination_log="/dev/termination-log"
 
-if [ -x "$(command -v c_rehash)" ]; then
-  # c_rehash is run here instead of update-ca-certificates because the latter requires root privileges
-  # and the rancher-machine container is run as non-root user.
-  c_rehash
-fi
-
 for i; do
   shift
   case $i in
@@ -42,4 +36,4 @@ if [ -n "$driver_url" ]; then
   fi
 fi
 
-{ { { { rancher-machine "$@" 2>&1; echo $? >&3; } | tee -a $termination_log >&4; } 3>&1; } | { read xs; exit $xs; } } 4>&1
+{ { { { rancher-machine "$@" 2>&1; echo $? >&3; } | tee -a $termination_log >&4; } 3>&1; } | { read xs; exit $xs; } } 4>&1