Merge pull request #3045 from dweomer/docker/19.03.15

docker/19.03.15

Dockerfile.dapper

@@ -60,7 +60,7 @@ ARG DISTRIB_ID=RancherOS
 
 ARG SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.3/policy.29
 
-ARG KERNEL_VERSION=4.14.176-rancher
+ARG KERNEL_VERSION=4.14.138-rancher
 ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-x86.tar.gz
 ARG KERNEL_URL_arm64=https://github.com/rancher/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-arm64.tar.gz
 
@@ -85,7 +85,7 @@ ARG SYSTEM_DOCKER_VERSION=17.06-ros6
 ARG SYSTEM_DOCKER_URL_amd64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
 ARG SYSTEM_DOCKER_URL_arm64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
 
-ARG USER_DOCKER_VERSION=19.03.8
+ARG USER_DOCKER_VERSION=19.03.15
 ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}
 
 ARG AZURE_SERVICE=false
@@ -158,7 +158,9 @@ RUN curl -fL ${!BUILD_DOCKER_URL} > /usr/bin/docker && \
     chmod +x /usr/bin/docker
 
 # Install dapper
-RUN curl -sL https://releases.rancher.com/dapper/latest/dapper-`uname -s`-`uname -m | sed 's/arm.*/arm/'` > /usr/bin/dapper && \
+# sidestep https://github.com/rancher/dapper/issues/92 with v0.5.4
+ARG DAPPER_VERSION="v0.5.4"
+RUN curl -sL https://github.com/rancher/dapper/releases/download/${DAPPER_VERSION}/dapper-$(uname -s)-$(uname -m) > /usr/bin/dapper && \
     chmod +x /usr/bin/dapper
 
 RUN cd ${DOWNLOADS} && \

README.md

@@ -18,68 +18,68 @@ it would really be bad if somebody did `docker rm -f $(docker ps -qa)` and delet
 
 ## Release
 
-- **v1.5.8 - Docker 19.03.15 - Linux 4.14.138**
+- **v1.5.7 - Docker 19.03.14 - Linux 4.14.138**
 
 ### ISO
 
-- https://releases.rancher.com/os/v1.5.8/rancheros.iso
-- https://releases.rancher.com/os/v1.5.8/hyperv/rancheros.iso
-- https://releases.rancher.com/os/v1.5.8/4glte/rancheros.iso
-- https://releases.rancher.com/os/v1.5.8/vmware/rancheros.iso
+- https://releases.rancher.com/os/v1.5.7/rancheros.iso
+- https://releases.rancher.com/os/v1.5.7/hyperv/rancheros.iso
+- https://releases.rancher.com/os/v1.5.7/4glte/rancheros.iso
+- https://releases.rancher.com/os/v1.5.7/vmware/rancheros.iso
 
 #### Special docker-machine Links
 
-- https://releases.rancher.com/os/v1.5.8/vmware/rancheros-autoformat.iso
-- https://releases.rancher.com/os/v1.5.8/proxmoxve/rancheros-autoformat.iso
+- https://releases.rancher.com/os/v1.5.7/vmware/rancheros-autoformat.iso
+- https://releases.rancher.com/os/v1.5.7/proxmoxve/rancheros-autoformat.iso
 
 ### Additional Downloads
 
 #### AMD64 Links
 
-* https://releases.rancher.com/os/v1.5.8/initrd
-* https://releases.rancher.com/os/v1.5.8/vmlinuz
-* https://releases.rancher.com/os/v1.5.8/rancheros.ipxe
-* https://releases.rancher.com/os/v1.5.8/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.5.7/initrd
+* https://releases.rancher.com/os/v1.5.7/vmlinuz
+* https://releases.rancher.com/os/v1.5.7/rancheros.ipxe
+* https://releases.rancher.com/os/v1.5.7/rootfs.tar.gz
 
 #### ARM64 Links
 
-* https://releases.rancher.com/os/v1.5.8/arm64/initrd
-* https://releases.rancher.com/os/v1.5.8/arm64/vmlinuz
-* https://releases.rancher.com/os/v1.5.8/arm64/rootfs_arm64.tar.gz
-* https://releases.rancher.com/os/v1.5.8/arm64/rancheros-raspberry-pi64.zip
+* https://releases.rancher.com/os/v1.5.7/arm64/initrd
+* https://releases.rancher.com/os/v1.5.7/arm64/vmlinuz
+* https://releases.rancher.com/os/v1.5.7/arm64/rootfs_arm64.tar.gz
+* https://releases.rancher.com/os/v1.5.7/arm64/rancheros-raspberry-pi64.zip
 
 #### Cloud Links
 
-* https://releases.rancher.com/os/v1.5.8/rancheros-openstack.img
-* https://releases.rancher.com/os/v1.5.8/rancheros-digitalocean.img
-* https://releases.rancher.com/os/v1.5.8/rancheros-cloudstack.img
-* https://releases.rancher.com/os/v1.5.8/rancheros-aliyun.vhd
-* https://releases.rancher.com/os/v1.5.8/rancheros-gce.tar.gz
+* https://releases.rancher.com/os/v1.5.7/rancheros-openstack.img
+* https://releases.rancher.com/os/v1.5.7/rancheros-digitalocean.img
+* https://releases.rancher.com/os/v1.5.7/rancheros-cloudstack.img
+* https://releases.rancher.com/os/v1.5.7/rancheros-aliyun.vhd
+* https://releases.rancher.com/os/v1.5.7/rancheros-gce.tar.gz
 
 #### VMware Links
 
-* https://releases.rancher.com/os/v1.5.8/vmware/initrd
-* https://releases.rancher.com/os/v1.5.8/vmware/rancheros.vmdk
-* https://releases.rancher.com/os/v1.5.8/vmware/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.5.7/vmware/initrd
+* https://releases.rancher.com/os/v1.5.7/vmware/rancheros.vmdk
+* https://releases.rancher.com/os/v1.5.7/vmware/rootfs.tar.gz
 
 #### Hyper-V Links
 
-* https://releases.rancher.com/os/v1.5.8/hyperv/initrd
-* https://releases.rancher.com/os/v1.5.8/hyperv/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.5.7/hyperv/initrd
+* https://releases.rancher.com/os/v1.5.7/hyperv/rootfs.tar.gz
 
 #### Proxmox VE Links
 
-* https://releases.rancher.com/os/v1.5.8/proxmoxve/initrd
-* https://releases.rancher.com/os/v1.5.8/proxmoxve/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.5.7/proxmoxve/initrd
+* https://releases.rancher.com/os/v1.5.7/proxmoxve/rootfs.tar.gz
 
 #### 4G-LTE Links
 
-* https://releases.rancher.com/os/v1.5.8/4glte/initrd
-* https://releases.rancher.com/os/v1.5.8/4glte/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.5.7/4glte/initrd
+* https://releases.rancher.com/os/v1.5.7/4glte/rootfs.tar.gz
 
 **Note**:
 1. you can use `http` instead of `https` in the above URLs, e.g. for iPXE.
-2. you can use `latest` instead of `v1.5.8` in the above URLs if you want to get the latest version.
+2. you can use `latest` instead of `v1.5.7` in the above URLs if you want to get the latest version.
 
 ### Amazon
 
@@ -89,22 +89,22 @@ SSH keys are added to the **`rancher`** user, so you must log in using the **ran
 
 Region | Type | AMI
 -------|------|------
-eu-north-1 | HVM | [ami-08b189555c5d2d8c3](https://eu-north-1.console.aws.amazon.com/ec2/home?region=eu-north-1#launchInstanceWizard:ami=ami-08b189555c5d2d8c3)
-ap-south-1 | HVM | [ami-0086964cb1ffc4fdb](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-0086964cb1ffc4fdb)
-eu-west-3 | HVM | [ami-088930cafc1ad9f20](https://eu-west-3.console.aws.amazon.com/ec2/home?region=eu-west-3#launchInstanceWizard:ami=ami-088930cafc1ad9f20)
-eu-west-2 | HVM | [ami-0fdf07cfd187af004](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-0fdf07cfd187af004)
-eu-west-1 | HVM | [ami-0cea454c576ececbd](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-0cea454c576ececbd)
-ap-northeast-2 | HVM | [ami-0fdb6555f88256d12](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-0fdb6555f88256d12)
-ap-northeast-1 | HVM | [ami-052c75c3e8757bcd9](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-052c75c3e8757bcd9)
-sa-east-1 | HVM | [ami-04e51c9d1edad1bfd](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-04e51c9d1edad1bfd)
-ca-central-1 | HVM | [ami-006a1ff3bf21003b3](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-006a1ff3bf21003b3)
-ap-southeast-1 | HVM | [ami-03b14c67c74644c2b](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-03b14c67c74644c2b)
-ap-southeast-2 | HVM | [ami-07059c8f12411bfcb](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-07059c8f12411bfcb)
-eu-central-1 | HVM | [ami-0fc1a9332c246bc56](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-0fc1a9332c246bc56)
-us-east-1 | HVM | [ami-02fe87f853d560d52](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-02fe87f853d560d52)
-us-east-2 | HVM | [ami-004259f4c48585992](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-004259f4c48585992)
-us-west-1 | HVM | [ami-0b382b76fadc95544](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-0b382b76fadc95544)
-us-west-2 | HVM | [ami-0cdefa6a0646eb511](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-0cdefa6a0646eb511)
+eu-north-1 | HVM | [ami-0e41e43cacd5b5bff](https://eu-north-1.console.aws.amazon.com/ec2/home?region=eu-north-1#launchInstanceWizard:ami=ami-0e41e43cacd5b5bff)
+ap-south-1 | HVM | [ami-07f5a3b5c2f9a5187](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-07f5a3b5c2f9a5187)
+eu-west-3 | HVM | [ami-0d0404464e82d3a05](https://eu-west-3.console.aws.amazon.com/ec2/home?region=eu-west-3#launchInstanceWizard:ami=ami-0d0404464e82d3a05)
+eu-west-2 | HVM | [ami-011c24fbf6301a27e](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-011c24fbf6301a27e)
+eu-west-1 | HVM | [ami-0be7cc6e6541317fc](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-0be7cc6e6541317fc)
+ap-northeast-2 | HVM | [ami-069590e2b10aff3e1](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-069590e2b10aff3e1)
+ap-northeast-1 | HVM | [ami-00fdbda1338d404a5](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-00fdbda1338d404a5)
+sa-east-1 | HVM | [ami-004b522e90358dfe6](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-004b522e90358dfe6)
+ca-central-1 | HVM | [ami-0076b253063664f6e](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-0076b253063664f6e)
+ap-southeast-1 | HVM | [ami-0d5f9904debd096c3](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-0d5f9904debd096c3)
+ap-southeast-2 | HVM | [ami-014aeb00e86cb0bde](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-014aeb00e86cb0bde)
+eu-central-1 | HVM | [ami-05ad7dba336fb5e6b](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-05ad7dba336fb5e6b)
+us-east-1 | HVM | [ami-0080194bbec628130](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-0080194bbec628130)
+us-east-2 | HVM | [ami-0ad897c9630fbd0a0](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-0ad897c9630fbd0a0)
+us-west-1 | HVM | [ami-08653419ce71d8779](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-08653419ce71d8779)
+us-west-2 | HVM | [ami-0507135bff98728c7](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-0507135bff98728c7)
 
 Additionally, images are available with support for Amazon EC2 Container Service (ECS) [here](https://rancher.com/docs/os/v1.x/en/installation/amazon-ecs/#amazon-ecs-enabled-amis).
 

cmd/power/shutdown.go

@@ -214,7 +214,7 @@ func shutdown(c *cli.Context) error {
 	// cannot contain slashes.
 	appName := filepath.Base(c.App.Name)
 	if appName == "shutdown" && timeArg != "" {
-		if timeArg != "now" && timeArg != "+0" {
+		if timeArg != "now" {
 			err := fmt.Errorf("Sorry, can't parse '%s' as time value (only 'now' supported)", timeArg)
 			log.Error(err)
 			return err

scripts/tools/flush_crt_nbd.sh

@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# How to use:
-#   make shell-bind
-#   cd scripts/tools/
-#   wget https://link/rancheros-xxx.img
-#   wget http://link/custom.crt
-#
-#   ./flush_crt_nbd.sh --img rancheros-openstack.img --cert custom.crt
-#   # or
-#   ./flush_crt_nbd.sh --initrd initrd-xxxx --cert custom.crt
-#
-#   exit
-#   ls ./build/
-#
-
-set -ex
-
-BASE_DIR=/tmp
-ORIGIN_DIR=/tmp/origin
-WORK_DIR=/tmp/work
-
-mkdir -p ${ORIGIN_DIR} ${WORK_DIR} ${DAPPER_SOURCE}/build
-
-while [ "$#" -gt 0 ]; do
-    case $1 in
-        --initrd)
-            shift 1
-            INITRD_FILE=$(readlink -f $1)
-            ;;
-        --img)
-            shift 1
-            IMG_FILE=$(readlink -f $1)
-            ;;
-        --cert)
-            shift 1
-            CERT_FILE=$(readlink -f $1)
-            ;;
-        *)
-            break
-            ;;
-    esac
-    shift 1
-done
-
-function rebuild_initrd() {
-    local initrd_name=$1
-    local output_dir=$2
-
-    # update and rebuild the initrd
-    pushd ${WORK_DIR}
-    mv initrd-* ${initrd_name}.gz
-    gzip -d ${initrd_name}.gz
-    cpio -i -F ${initrd_name}
-    rm -f ${initrd_name}
-    cat ${CERT_FILE} >> ${WORK_DIR}/usr/etc/ssl/certs/ca-certificates.crt
-    find | cpio -H newc -o | gzip -9 > ${output_dir}/${initrd_name}
-    popd
-}
-
-
-if [ ! -z ${INITRD_FILE} ]; then
-    cp ${INITRD_FILE} ${WORK_DIR}/
-    rebuild_initrd $(basename ${INITRD_FILE}) ${DAPPER_SOURCE}/build/
-    exit 0
-fi
-
-# copy the iso content
-cp -a ${IMG_FILE} ${IMG_FILE}_new
-qemu-nbd -c /dev/nbd0 --partition=1 ${IMG_FILE}_new
-mount /dev/nbd0 ${ORIGIN_DIR}
-
-# copy the initrd file
-INITRD_NAME=$(basename ${ORIGIN_DIR}/boot/initrd-*)
-cp ${ORIGIN_DIR}/boot/initrd-* ${WORK_DIR}/
-
-rebuild_initrd ${INITRD_NAME} ${ORIGIN_DIR}/boot
-
-# copy out
-umount ${ORIGIN_DIR}
-qemu-nbd -d /dev/nbd0
-mv ${IMG_FILE}_new ${DAPPER_SOURCE}/build/$(basename ${IMG_FILE})
-
-# cleanup
-rm -rf ${WORK_DIR}/