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.159-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.5
 ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}
 
 ARG AZURE_SERVICE=false

Makefile

@@ -53,13 +53,13 @@ vmware: .dapper
 
 hyperv: .dapper
 	mkdir -p dist
-	APPEND_SYSTEM_IMAGES="rancher/os-hypervvmtools:v4.14.138-rancher-1" \
+	APPEND_SYSTEM_IMAGES="rancher/os-hypervvmtools:v4.14.159-rancher-1" \
 	./.dapper release-hyperv
 
 azurebase: .dapper
 	mkdir -p dist
 	AZURE_SERVICE="true" \
-	APPEND_SYSTEM_IMAGES="rancher/os-hypervvmtools:v4.14.138-rancher-1 rancher/os-waagent:v2.2.34-1" \
+	APPEND_SYSTEM_IMAGES="rancher/os-hypervvmtools:v4.14.159-rancher-1 rancher/os-waagent:v2.2.34-1" \
 	./.dapper release-azurebase
 
 4glte: .dapper

README.md

@@ -1,10 +1,3 @@
-# Development and Maintenance Status
-RancherOS 1.x is no longer being actively maintained. There are two significant reasons behind this product decision:
-1. **Docker** - The current industry requirements for a container runtime are very much evolving. Container runtimes like containerd and CRIO are now being actively considered as the default choice. RancherOS 1.x, which was specifically designed around using Docker engine only, unfortunately does not lend itself, in its current design, to this new evolving requirement.
-2. **ISV Support** - RancherOS was specifically designed as a minimalistic OS to support purpose-built containerized applications. It was not designed to be used as a general purpose OS (such as CentOS or Ubuntu). As such, most ISVs have not certified their software to run on RancherOS, nor does RancherOS even contain the necessary components for many of these applications to run.
-
-We're working on a replacement. Stay tuned!
-
 # RancherOS
 
 [![Build Status](https://drone-pr.rancher.io/api/badges/rancher/os/status.svg?branch=master)](https://drone-pr.rancher.io/rancher/os)
@@ -25,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.4 - Docker 18.09.08 - Linux 4.14.138**
 
 ### ISO
 
-- https://releases.rancher.com/os/v1.5.8/rancheros.iso
+- https://releases.rancher.com/os/v1.5.4/rancheros.iso
-- https://releases.rancher.com/os/v1.5.8/hyperv/rancheros.iso
+- https://releases.rancher.com/os/v1.5.4/hyperv/rancheros.iso
-- https://releases.rancher.com/os/v1.5.8/4glte/rancheros.iso
+- https://releases.rancher.com/os/v1.5.4/4glte/rancheros.iso
-- https://releases.rancher.com/os/v1.5.8/vmware/rancheros.iso
+- https://releases.rancher.com/os/v1.5.4/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.4/vmware/rancheros-autoformat.iso
-- https://releases.rancher.com/os/v1.5.8/proxmoxve/rancheros-autoformat.iso
+- https://releases.rancher.com/os/v1.5.4/proxmoxve/rancheros-autoformat.iso
 
 ### Additional Downloads
 
 #### AMD64 Links
 
-* https://releases.rancher.com/os/v1.5.8/initrd
+* https://releases.rancher.com/os/v1.5.4/initrd
-* https://releases.rancher.com/os/v1.5.8/vmlinuz
+* https://releases.rancher.com/os/v1.5.4/vmlinuz
-* https://releases.rancher.com/os/v1.5.8/rancheros.ipxe
+* https://releases.rancher.com/os/v1.5.4/rancheros.ipxe
-* https://releases.rancher.com/os/v1.5.8/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.5.4/rootfs.tar.gz
 
 #### ARM64 Links
 
-* https://releases.rancher.com/os/v1.5.8/arm64/initrd
+* https://releases.rancher.com/os/v1.5.4/arm64/initrd
-* https://releases.rancher.com/os/v1.5.8/arm64/vmlinuz
+* https://releases.rancher.com/os/v1.5.4/arm64/vmlinuz
-* https://releases.rancher.com/os/v1.5.8/arm64/rootfs_arm64.tar.gz
+* https://releases.rancher.com/os/v1.5.4/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.4/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.4/rancheros-openstack.img
-* https://releases.rancher.com/os/v1.5.8/rancheros-digitalocean.img
+* https://releases.rancher.com/os/v1.5.4/rancheros-digitalocean.img
-* https://releases.rancher.com/os/v1.5.8/rancheros-cloudstack.img
+* https://releases.rancher.com/os/v1.5.4/rancheros-cloudstack.img
-* https://releases.rancher.com/os/v1.5.8/rancheros-aliyun.vhd
+* https://releases.rancher.com/os/v1.5.4/rancheros-aliyun.vhd
-* https://releases.rancher.com/os/v1.5.8/rancheros-gce.tar.gz
+* https://releases.rancher.com/os/v1.5.4/rancheros-gce.tar.gz
 
 #### VMware Links
 
-* https://releases.rancher.com/os/v1.5.8/vmware/initrd
+* https://releases.rancher.com/os/v1.5.4/vmware/initrd
-* https://releases.rancher.com/os/v1.5.8/vmware/rancheros.vmdk
+* https://releases.rancher.com/os/v1.5.4/vmware/rancheros.vmdk
-* https://releases.rancher.com/os/v1.5.8/vmware/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.5.4/vmware/rootfs.tar.gz
 
 #### Hyper-V Links
 
-* https://releases.rancher.com/os/v1.5.8/hyperv/initrd
+* https://releases.rancher.com/os/v1.5.4/hyperv/initrd
-* https://releases.rancher.com/os/v1.5.8/hyperv/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.5.4/hyperv/rootfs.tar.gz
 
 #### Proxmox VE Links
 
-* https://releases.rancher.com/os/v1.5.8/proxmoxve/initrd
+* https://releases.rancher.com/os/v1.5.4/proxmoxve/initrd
-* https://releases.rancher.com/os/v1.5.8/proxmoxve/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.5.4/proxmoxve/rootfs.tar.gz
 
 #### 4G-LTE Links
 
-* https://releases.rancher.com/os/v1.5.8/4glte/initrd
+* https://releases.rancher.com/os/v1.5.4/4glte/initrd
-* https://releases.rancher.com/os/v1.5.8/4glte/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.5.4/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.4` in the above URLs if you want to get the latest version.
 
 ### Amazon
 
@@ -96,22 +89,24 @@ 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)
+eu-north-1 | HVM | [ami-008be767228de6683](https://eu-north-1.console.aws.amazon.com/ec2/home?region=eu-north-1#launchInstanceWizard:ami=ami-008be767228de6683)
-ap-south-1 | HVM | [ami-0086964cb1ffc4fdb](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-0086964cb1ffc4fdb)
+ap-south-1 | HVM | [ami-06d0903ccdd125c0c](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-06d0903ccdd125c0c)
-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-3 | HVM | [ami-0cbb2f6862669fe62](https://eu-west-3.console.aws.amazon.com/ec2/home?region=eu-west-3#launchInstanceWizard:ami=ami-0cbb2f6862669fe62)
-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-2 | HVM | [ami-0d5ce579aeef247e6](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-0d5ce579aeef247e6)
-eu-west-1 | HVM | [ami-0cea454c576ececbd](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-0cea454c576ececbd)
+eu-west-1 | HVM | [ami-0f48831932827ad91](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-0f48831932827ad91)
-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-2 | HVM | [ami-0fcc552e7ee5cb04c](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-0fcc552e7ee5cb04c)
-ap-northeast-1 | HVM | [ami-052c75c3e8757bcd9](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-052c75c3e8757bcd9)
+ap-northeast-1 | HVM | [ami-082e73823959a006f](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-082e73823959a006f)
-sa-east-1 | HVM | [ami-04e51c9d1edad1bfd](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-04e51c9d1edad1bfd)
+sa-east-1 | HVM | [ami-0613568e5abe888e8](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-0613568e5abe888e8)
-ca-central-1 | HVM | [ami-006a1ff3bf21003b3](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-006a1ff3bf21003b3)
+ca-central-1 | HVM | [ami-0fe07f3c02d7e1b73](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-0fe07f3c02d7e1b73)
-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-1 | HVM | [ami-0dc36da6fc839e3b4](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-0dc36da6fc839e3b4)
-ap-southeast-2 | HVM | [ami-07059c8f12411bfcb](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-07059c8f12411bfcb)
+ap-southeast-2 | HVM | [ami-0d1e30aed40a09e7a](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-0d1e30aed40a09e7a)
-eu-central-1 | HVM | [ami-0fc1a9332c246bc56](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-0fc1a9332c246bc56)
+eu-central-1 | HVM | [ami-0079d316193c1c1f2](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-0079d316193c1c1f2)
-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-1 | HVM | [ami-03383c16defb1ed02](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-03383c16defb1ed02)
-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-east-2 | HVM | [ami-0ebe6ed6e656d9aa9](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-0ebe6ed6e656d9aa9)
-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-1 | HVM | [ami-09b8160a9edaeb22a](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-09b8160a9edaeb22a)
-us-west-2 | HVM | [ami-0cdefa6a0646eb511](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-0cdefa6a0646eb511)
+us-west-2 | HVM | [ami-0d554a1dd1d4ed527](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-0d554a1dd1d4ed527)
+cn-north-1 | HVM | [ami-025d9b43810675e5f](https://cn-north-1.console.amazonaws.cn/ec2/home?region=cn-north-1#launchInstanceWizard:ami=ami-025d9b43810675e5f)
+cn-northwest-1 | HVM | [ami-00be191a22f30767e](https://cn-northwest-1.console.amazonaws.cn/ec2/home?region=cn-northwest-1#launchInstanceWizard:ami=ami-00be191a22f30767e)
 
 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).
 
@@ -135,7 +130,7 @@ Please submit any **Rancher** bugs, issues, and feature requests to [rancher/ran
 
 ## License
 
-Copyright (c) 2014-2020 [Rancher Labs, Inc.](http://rancher.com)
+Copyright (c) 2014-2019 [Rancher Labs, Inc.](http://rancher.com)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

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

pkg/util/network/network.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"net"
 	"os"
 	"strings"
 
@@ -109,7 +108,6 @@ func LoadFromNetwork(location string) ([]byte, error) {
 	}
 	SetProxyEnvironmentVariables()
 
-	net.DefaultResolver.PreferGo = true
 	cfg := config.LoadConfig()
 	client := httpRetry.NewHTTPClient()
 	client.MaxRetries = cfg.Rancher.HTTPLoadRetries

scripts/tools/collect_rancheros_info.sh

@@ -46,9 +46,6 @@ docker info > $dest_conf_dir/docker-info
 cat /proc/mounts > $dest_conf_dir/proc-mounts
 cat /proc/1/mounts > $dest_conf_dir/proc-1-mounts
 cat /proc/cmdline > $dest_conf_dir/cmdline
-ip a > $dest_conf_dir/ipall
-ip route > $dest_conf_dir/iproutes
-cat /etc/resolv.conf > $dest_conf_dir/resolv
 dmesg > $dest_conf_dir/dmesg.log
 
 cd $conf_file_src_dir && cp -rf `ls  | grep -E -v "^(pem)$"` $dest_conf_dir

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}/