From c60f8d64de0e8584a1147ee170d5f52c810ca6f9 Mon Sep 17 00:00:00 2001 From: niusmallnan Date: Fri, 25 Jan 2019 09:25:59 +0800 Subject: [PATCH 1/3] Add upgrading notes for ROS --- content/os/v1.x/en/upgrading/_index.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/content/os/v1.x/en/upgrading/_index.md b/content/os/v1.x/en/upgrading/_index.md index 05658c050f8..744f5712c81 100644 --- a/content/os/v1.x/en/upgrading/_index.md +++ b/content/os/v1.x/en/upgrading/_index.md @@ -135,3 +135,24 @@ rancher: url: https://releases.rancher.com/os/releases.yml image: rancher/os ``` + +### Upgrading Notes + +Upgrading to 1.4.0 and greater you must move or copy the files of user-docker's data-root otherwise your data will not be available: + +``` +#!/bin/bash + +old_docker_root="/proc/1/root/var/lib/docker" +new_docker_root="/proc/1/root/var/lib/user-docker" + +system-docker stop docker +cp -a $old_docker_root/* $new_docker_root +system-docker start docker +``` + +Upgrading to 1.4.0 and greater you must set `rancher.system_docker.bip` if you want to have another bridge IP of docker-sys: + +``` +$ sudo ros config set rancher.system_docker.bip 10.0.0.1/16 +``` From 4ff5c9557ec9e56b191510631b08da6384952d2b Mon Sep 17 00:00:00 2001 From: Denise Date: Thu, 24 Jan 2019 17:56:16 -0800 Subject: [PATCH 2/3] Update _index.md --- content/os/v1.x/en/upgrading/_index.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/content/os/v1.x/en/upgrading/_index.md b/content/os/v1.x/en/upgrading/_index.md index 744f5712c81..cabb05d81cd 100644 --- a/content/os/v1.x/en/upgrading/_index.md +++ b/content/os/v1.x/en/upgrading/_index.md @@ -7,7 +7,7 @@ If RancherOS has released a new version and you want to learn how to upgrade you Since RancherOS is a kernel and initrd, the upgrade process is downloading a new kernel and initrd, and updating the boot loader to point to it. The old kernel and initrd are not removed. If there is a problem with your upgrade, you can select the old kernel from the Syslinux bootloader. -To see all of our releases, please visit our [releases page](https://github.com/rancher/os/releases) in GitHub. +Before upgrading to any version, please review the release notes on our [releases page](https://github.com/rancher/os/releases) in GitHub to review any updates in the release. > **Note:** If you are using [`docker-machine`]({{< baseurl >}}/os/v1.x/en/installation/running-rancheros/workstation/docker-machine/) then you will not be able to upgrade your RancherOS version. You need to delete and re-create the machine. @@ -136,9 +136,9 @@ rancher: image: rancher/os ``` -### Upgrading Notes +### Upgrading to 1.4.0+ Notes -Upgrading to 1.4.0 and greater you must move or copy the files of user-docker's data-root otherwise your data will not be available: +Due to changes in the location of user-docker's data-root, after upgrading to v1.4.0+, you must move or copy the files of user-docker's data-root. If you do not do this, your data will *NOT* be available. ``` #!/bin/bash @@ -151,8 +151,12 @@ cp -a $old_docker_root/* $new_docker_root system-docker start docker ``` -Upgrading to 1.4.0 and greater you must set `rancher.system_docker.bip` if you want to have another bridge IP of docker-sys: +If you had another bridge IP set for system-docker, you may need to explicitly set it again depending on your upgrade path. Before re-setting it, you can confirm if it's set. ``` +# Check to see if docker bridge IP is set +$ sudo ros config get rancher.system_docker.bip + +# If it is no longer set, re-set the setting $ sudo ros config set rancher.system_docker.bip 10.0.0.1/16 ``` From f800fc23556c45e554f1a55345f6033080e46a26 Mon Sep 17 00:00:00 2001 From: Denise Date: Thu, 24 Jan 2019 17:57:11 -0800 Subject: [PATCH 3/3] Update _index.md --- content/os/v1.x/en/upgrading/_index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/os/v1.x/en/upgrading/_index.md b/content/os/v1.x/en/upgrading/_index.md index cabb05d81cd..beedfcdd821 100644 --- a/content/os/v1.x/en/upgrading/_index.md +++ b/content/os/v1.x/en/upgrading/_index.md @@ -136,7 +136,9 @@ rancher: image: rancher/os ``` -### Upgrading to 1.4.0+ Notes +### Upgrade Notes for v1.4.0+ + +If you are upgrading to v1.4.0+, please review these notes that could alter your RancherOS settings. Due to changes in the location of user-docker's data-root, after upgrading to v1.4.0+, you must move or copy the files of user-docker's data-root. If you do not do this, your data will *NOT* be available.