Merge pull request #1458 from joshwget/only-set-non-empty-password

Only set rancher password if non-empty
(cherry picked from commit b2059859df)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Dockerfile.dapper

@@ -53,7 +53,7 @@ ARG DOCKER_BUILD_VERSION=1.10.3
 ARG DOCKER_BUILD_PATCH_VERSION=v${DOCKER_BUILD_VERSION}-ros1
 ARG SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.3/policy.29
 
-ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.4.0-42.62-rancher1-1/linux-4.4.21-rancher-x86.tar.gz
+ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.4.0-47.68-rancher1/linux-4.4.24-rancher-x86.tar.gz
 ARG KERNEL_URL_arm64=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.4.0-arm64.8/linux-4.4.0-rancher-arm64.tar.gz
 
 ARG DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz

README.md

@@ -14,12 +14,12 @@ it would really be bad if somebody did `docker rm -f $(docker ps -qa)` and delet
 
 ## Latest Release
 
-**v0.6.1 - Docker 1.12.1 - Linux 4.4.19**
+**v0.7.1 - Docker 1.12.3 - Linux 4.4.24**
 
 ### ISO
 
 https://releases.rancher.com/os/latest/rancheros.iso  
-https://releases.rancher.com/os/v0.6.1/rancheros.iso  
+https://releases.rancher.com/os/v0.7.1/rancheros.iso  
 
 ### Additional Downloads
 
@@ -29,25 +29,25 @@ https://releases.rancher.com/os/v0.6.1/rancheros.iso
 * https://releases.rancher.com/os/latest/iso-checksums.txt
 * https://releases.rancher.com/os/latest/rancheros-openstack.img
 * https://releases.rancher.com/os/latest/rancheros-raspberry-pi.zip
-* https://releases.rancher.com/os/latest/rancheros-v0.6.1.tar.gz
+* https://releases.rancher.com/os/latest/rancheros-v0.7.1.tar.gz
 * https://releases.rancher.com/os/latest/rancheros.iso
 * https://releases.rancher.com/os/latest/rootfs_arm.tar.gz
 * https://releases.rancher.com/os/latest/rootfs_arm64.tar.gz
 * https://releases.rancher.com/os/latest/rootfs.tar.gz
 * https://releases.rancher.com/os/latest/vmlinuz
 
-#### v0.6.1
+#### v0.7.1
 
-* https://releases.rancher.com/os/v0.6.1/initrd
-* https://releases.rancher.com/os/v0.6.1/iso-checksums.txt
-* https://releases.rancher.com/os/v0.6.1/rancheros-openstack.img
-* https://releases.rancher.com/os/v0.6.1/rancheros-raspberry-pi.zip
-* https://releases.rancher.com/os/v0.6.1/rancheros-v0.6.1.tar.gz
-* https://releases.rancher.com/os/v0.6.1/rancheros.iso
-* https://releases.rancher.com/os/v0.6.1/rootfs_arm.tar.gz
-* https://releases.rancher.com/os/v0.6.1/rootfs_arm64.tar.gz
-* https://releases.rancher.com/os/v0.6.1/rootfs.tar.gz
-* https://releases.rancher.com/os/v0.6.1/vmlinuz
+* https://releases.rancher.com/os/v0.7.1/initrd
+* https://releases.rancher.com/os/v0.7.1/iso-checksums.txt
+* https://releases.rancher.com/os/v0.7.1/rancheros-openstack.img
+* https://releases.rancher.com/os/v0.7.1/rancheros-raspberry-pi.zip
+* https://releases.rancher.com/os/v0.7.1/rancheros-v0.7.1.tar.gz
+* https://releases.rancher.com/os/v0.7.1/rancheros.iso
+* https://releases.rancher.com/os/v0.7.1/rootfs_arm.tar.gz
+* https://releases.rancher.com/os/v0.7.1/rootfs_arm64.tar.gz
+* https://releases.rancher.com/os/v0.7.1/rootfs.tar.gz
+* https://releases.rancher.com/os/v0.7.1/vmlinuz
 
 **Note**: you can use `http` instead of `https` in the above URLs, e.g. for iPXE.  
 
@@ -74,7 +74,7 @@ us-west-2 | HVM |  [ami-1ed3007e](https://console.aws.amazon.com/ec2/home?region
 
 We are providing a disk image that users can download and import for use in Google Compute Engine. The image can be obtained from the release artifacts for RancherOS.
 
-[Download Image](https://github.com/rancher/os/releases/download/v0.6.1/rancheros-v0.6.1.tar.gz)
+[Download Image](https://github.com/rancher/os/releases/download/v0.7.1/rancheros-v0.7.1.tar.gz)
 
 Please follow the directions at our [docs to launch in GCE](http://docs.rancher.com/os/running-rancheros/cloud/gce/).
 

cmd/console/console.go

@@ -51,15 +51,17 @@ func Main() {
 	}
 
 	password := config.GetCmdline("rancher.password")
-	cmd := exec.Command("chpasswd")
-	cmd.Stdin = strings.NewReader(fmt.Sprint("rancher:", password))
-	if err := cmd.Run(); err != nil {
-		log.Error(err)
-	}
+	if password != "" {
+		cmd := exec.Command("chpasswd")
+		cmd.Stdin = strings.NewReader(fmt.Sprint("rancher:", password))
+		if err := cmd.Run(); err != nil {
+			log.Error(err)
+		}
 
-	cmd = exec.Command("bash", "-c", `sed -E -i 's/(rancher:.*:).*(:.*:.*:.*:.*:.*:.*)$/\1\2/' /etc/shadow`)
-	if err := cmd.Run(); err != nil {
-		log.Error(err)
+		cmd = exec.Command("bash", "-c", `sed -E -i 's/(rancher:.*:).*(:.*:.*:.*:.*:.*:.*)$/\1\2/' /etc/shadow`)
+		if err := cmd.Run(); err != nil {
+			log.Error(err)
+		}
 	}
 
 	if err := setupSSH(cfg); err != nil {
@@ -93,7 +95,7 @@ func Main() {
 		}
 	}
 
-	cmd = exec.Command("bash", "-c", `echo 'RancherOS \n \l' > /etc/issue`)
+	cmd := exec.Command("bash", "-c", `echo 'RancherOS \n \l' > /etc/issue`)
 	if err := cmd.Run(); err != nil {
 		log.Error(err)
 	}

os-config.tpl.yml

@@ -6,7 +6,7 @@ rancher:
     hostname: {{.HOSTNAME_DEFAULT}}
     {{if eq "amd64" .ARCH -}}
     docker:
-      engine: docker-1.12.1
+      engine: docker-1.12.3
     {{else -}}
     docker:
       engine: docker-1.11.2
@@ -373,7 +373,7 @@ rancher:
       - /opt:/opt
     docker:
       {{if eq "amd64" .ARCH -}}
-      image: {{.OS_REPO}}/os-docker:1.12.1{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-docker:1.12.3{{.SUFFIX}}
       {{else -}}
       image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}}
       {{end -}}
@@ -415,7 +415,7 @@ rancher:
     image: {{.OS_REPO}}/os
   docker:
     {{if eq "amd64" .ARCH -}}
-    engine: docker-1.12.1
+    engine: docker-1.12.3
     {{else -}}
     engine: docker-1.11.2
     {{end -}}