Merge branch 'master' into audit-17

2026-09-28 14:08:55 +00:00 · 2019-09-08 13:09:37 -07:00
parent df9ac5d8d1 cbd327a952
commit 335e46d515
30 changed files with 1142 additions and 495 deletions
@@ -83,7 +83,7 @@ FROM scratch
 COPY engine /engine
 ```

-Once the image is built a [system service]({{< baseurl >}}/os/v1.x/en/installation/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-1.12.6.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
+Once the image is built a [system service]({{< baseurl >}}/os/v1.x/en/installation/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-18.06.3-ce.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.

 All of the previously mentioned methods of switching Docker engines are now available. For example, if your service file is located at `https://myservicefile` then the following cloud-config file could be used to use your custom Docker engine.

@@ -24,6 +24,12 @@ RancherOS runs on virtualization platforms, cloud providers and bare metal serve

 [Azure]({{< baseurl >}}/os/v1.x/en/installation/running-rancheros/cloud/azure)

+[OpenStack]({{< baseurl >}}/os/v1.x/en/installation/running-rancheros/cloud/openstack)
+
+[VMware ESXi]({{< baseurl >}}/os/v1.x/en/installation/running-rancheros/cloud/vmware-esxi)
+
+[Aliyun]({{< baseurl >}}/os/v1.x/en/installation/running-rancheros/cloud/aliyun)
+
 #### Bare Metal & Virtual Servers

 [PXE]({{< baseurl >}}/os/v1.x/en/installation/running-rancheros/server/pxe)
@@ -0,0 +1,34 @@
+---
+title: Aliyun
+weight: 111
+---
+
+# Adding the RancherOS Image into Aliyun
+
+RancherOS is available as an image in Aliyun, and can be easily run in Elastic Compute Service (ECS).  Let’s walk through how to upload the ECS image.
+
+1. Download the most recent RancherOS image. The image `rancheros-aliyun.vhd` can be found in the [release artifacts](https://github.com/rancher/os/releases). 
+2. Follow Aliyun's instructions on how to [upload the image](https://help.aliyun.com/document_detail/127285.html). Before the image can be added, it must be uploaded into an OSS bucket.
+3. Once the image is added to your ECS, we can start creating new instances!
+
+Example: 
+
+![RancherOS on Aliyun 1]({{< baseurl >}}/img/os/RancherOS_aliyun1.jpg)
+
+## Options
+
+| Option | Description | 
+| --- | --- |
+| Root disk size | The size must be greater than 10GB. Note: When booting the instance, the value must be kept the same. |
+| Platform |  Select `Others Linux` |
+| Image Format | Select `VHD` |
+
+### Launching RancherOS using Aliyun Console
+
+After the image is uploaded, we can use the `Aliyun Console` to start a new instance. Currently, RancherOS on Aliyun only supports SSH key access, so it can only be deployed through the UI. 
+
+Since the image is private, we need to use the `Custom Images`.
+
+![RancherOS on Aliyun 2]({{< baseurl >}}/img/os/RancherOS_aliyun2.jpg)
+
+After the instance is successfully started, we can login with the `rancher` user via SSH.
@@ -82,6 +82,22 @@ rancher/os:v0.5.0 remote

 Alternatively, you can set the installer image to any image in System Docker to install RancherOS. This is particularly useful for machines that will not have direct access to the internet.

+#### Caching Images
+
+_Available as of v1.5.3_
+
+Some configurations included in `cloud-config` require images to be downloaded from Docker to start. After installation, these images are downloaded automatically by RancherOS when booting. An example of these configurations are:
+
+- rancher.services_include
+- rancher.console
+- rancher.docker
+
+If you want to download and save these images to disk during installation, they will be cached and not need to be downloaded again upon each boot. You can cache these images by adding `-s` when using `ros install`:
+
+```
+$ ros install -d <disk> -c <cloud-config.yaml> -s
+```
+
 ### SSH into RancherOS

 After installing RancherOS, you can ssh into RancherOS using your private key and the **rancher** user.