diff --git a/content/os/installation/boot-process/built-in-system-services/_index.md b/content/os/installation/boot-process/built-in-system-services/_index.md index b7e21fb03c8..35797833487 100644 --- a/content/os/installation/boot-process/built-in-system-services/_index.md +++ b/content/os/installation/boot-process/built-in-system-services/_index.md @@ -26,9 +26,7 @@ Runs `ntpd` in a System Docker container. This service provides the RancherOS user interface by running `sshd` and `getty`. It completes the RancherOS configuration on start up: 1. If the `rancher.password=` kernel parameter exists, it sets `` as the password for the `rancher` user. - 2. If there are no host SSH keys, it generates host SSH keys and saves them under `rancher.ssh.keys` in [cloud-config]({{< baseurl >}}/os/installation/configuration/#cloud-config). - 3. Runs `cloud-init -execute`, which does the following: * Updates `.ssh/authorized_keys` in `/home/rancher` and `/home/docker` from [cloud-config]({{< baseurl >}}/os/installation/configuration/ssh-keys/) and metadata. @@ -36,11 +34,8 @@ This service provides the RancherOS user interface by running `sshd` and `getty` * Resizes the device specified by the `rancher.resize_device` [cloud-config]({{< baseurl >}}/os/installation/configuration/resizing-device-partition/) setting. * Mount devices specified in the `mounts` [cloud-config]({{< baseurl >}}/os/installation/storage/additional-mounts/) setting. * Set sysctl parameters specified in the`rancher.sysctl` [cloud-config]({{< baseurl >}}/os/installation/configuration/sysctl/) setting. - 4. If user-data contained a file that started with `#!`, then a file would be saved at `/var/lib/rancher/conf/cloud-config-script` during cloud-init and then executed. Any errors are ignored. - 5. Runs `/opt/rancher/bin/start.sh` if it exists and is executable. Any errors are ignored. - 6. Runs `/etc/rc.local` if it exists and is executable. Any errors are ignored. ### docker diff --git a/content/os/installation/configuration/_index.md b/content/os/installation/configuration/_index.md index 0961a9bf37a..18f4affb432 100644 --- a/content/os/installation/configuration/_index.md +++ b/content/os/installation/configuration/_index.md @@ -8,7 +8,6 @@ weight: 120 There are two ways that RancherOS can be configured. 1. A cloud-config file can be used to provide configuration when first booting RancherOS. - 2. Manually changing configuration with the `ros config` command. Typically, when you first boot the server, you pass in a cloud-config file to configure the initialization of the server. After the first boot, if you have any changes for the configuration, it's recommended that you use `ros config` to set the necessary configuration properties. Any changes will be saved on disk and a reboot will be required for changes to be applied. diff --git a/content/os/installation/custom-builds/custom-kernels/_index.md b/content/os/installation/custom-builds/custom-kernels/_index.md index a42f94ce1ad..f6319f0087e 100644 --- a/content/os/installation/custom-builds/custom-kernels/_index.md +++ b/content/os/installation/custom-builds/custom-kernels/_index.md @@ -11,11 +11,9 @@ We build the kernel for RancherOS at the [os-kernel repository](https://github.c 1. Create a clone of the [os-kernel](https://github.com/rancher/os-kernel) repository to your local machine using `git clone`. - ``` $ git clone https://github.com/rancher/os-kernel.git ``` - 2. In the `./Dockerfile.dapper` file, update the `KERNEL_TAG`, `KERNEL_VERSION`, `KERNEL_URL` and `KERNEL_SHA1`. `KERNEL_URL` points to Linux kernel sources archive, packaged as `.tar.gz` or `.tar.xz`. `KERNEL_SHA1` is the `SHA1` sum of the kernel sources archive. `./Dockerfile.dapper` file @@ -27,7 +25,6 @@ We build the kernel for RancherOS at the [os-kernel repository](https://github.c ENV KERNEL_SHA1=5c10724a0e7e97b72046be841df0c69c6e2a03c2 ENV KERNEL_URL=https://github.com/rancher/linux/archive/${KERNEL_TAG}.tar.gz ``` - 3. After you've replaced the `KERNEL_*` values, run `make` in the root `os-kernel` directory. After the build is completed, a `./dist/kernel` directory will be created with the freshly built kernel tarball and headers. ``` @@ -58,7 +55,6 @@ By default, RancherOS ships with the kernel provided by the [os-kernel repositor ``` $ git clone https://github.com/rancher/os.git ``` - 2. In the root of the repository, the "General Configuration" section of `Dockerfile.dapper` will need to be updated. Using your favorite editor, replace the appropriate `KERNEL_URL` value with a URL of your compiled custom kernel tarball. Ideally, the URL will use `HTTPS`. `Dockerfile.dapper` file @@ -100,5 +96,4 @@ By default, RancherOS ships with the kernel provided by the [os-kernel repositor firmware/ ... ``` - 3. After you've replaced the URL with your custom kernel, you can follow the steps in [building your own custom RancherOS ISO]({{< baseurl >}}/os/installation/custom-builds/custom-rancheros-iso/). diff --git a/content/os/installation/custom-builds/custom-rancheros-iso/_index.md b/content/os/installation/custom-builds/custom-rancheros-iso/_index.md index aa57b54a433..3f58ea128e2 100644 --- a/content/os/installation/custom-builds/custom-rancheros-iso/_index.md +++ b/content/os/installation/custom-builds/custom-rancheros-iso/_index.md @@ -8,17 +8,12 @@ weight: 182 It's easy to build your own RancherOS ISO. 1. Create a clone of the main [RancherOS repository](https://github.com/rancher/os) to your local machine with a `git clone`. - ``` $ git clone https://github.com/rancher/os.git ``` - 2. In the root of the repository, the "General Configuration" section of `Dockerfile.dapper` can be updated to use [custom kernels]({{< baseurl >}}/os/installation/custom-builds/custom-kernels). - 3. After you've saved your edits, run `make` in the root directory. After the build has completed, a `./dist/artifacts` directory will be created with the custom built RancherOS release files. - Build Requirements: `bash`, `make`, `docker` (Docker version >= 1.10.3) - ``` $ make $ cd dist/artifacts diff --git a/content/os/installation/running-rancheros/cloud/aws/_index.md b/content/os/installation/running-rancheros/cloud/aws/_index.md index 0e962c83046..4bd99cb44db 100644 --- a/content/os/installation/running-rancheros/cloud/aws/_index.md +++ b/content/os/installation/running-rancheros/cloud/aws/_index.md @@ -28,27 +28,16 @@ Let’s walk through how to import and create a RancherOS on EC2 machine using t 1. First login to your AWS console, and go to the EC2 dashboard, click on **Launch Instance**: - ![RancherOS on AWS 1]({{< baseurl >}}/img/os/Rancher_aws1.png) - 2. Select the **Community AMIs** on the sidebar and search for **RancherOS**. Pick the latest version and click **Select**. - ![RancherOS on AWS 2]({{< baseurl >}}/img/os/Rancher_aws2.png) - 3. Go through the steps of creating the instance type through the AWS console. If you want to pass in a [cloud-config]({{< baseurl >}}/os/installation/configuration/#cloud-config) file during boot of RancherOS, you'd pass in the file as **User data** by expanding the **Advanced Details** in **Step 3: Configure Instance Details**. You can pass in the data as text or as a file. - ![RancherOS on AWS 6]({{< baseurl >}}/img/os/Rancher_aws6.png) - After going through all the steps, you finally click on **Launch**, and either create a new key pair or choose an existing key pair to be used with the EC2 instance. If you have created a new key pair, download the key pair. If you have chosen an existing key pair, make sure you have the key pair accessible. Click on **Launch Instances**. - ![RancherOS on AWS 3]({{< baseurl >}}/img/os/Rancher_aws3.png) - 4. Your instance will be launching and you can click on **View Instances** to see it's status. - ![RancherOS on AWS 4]({{< baseurl >}}/img/os/Rancher_aws4.png) - Your instance is now running! - ![RancherOS on AWS 5]({{< baseurl >}}/img/os/Rancher_aws5.png) ## Logging into RancherOS diff --git a/content/os/installation/running-rancheros/cloud/gce/_index.md b/content/os/installation/running-rancheros/cloud/gce/_index.md index bd235740c21..4b19c198d84 100644 --- a/content/os/installation/running-rancheros/cloud/gce/_index.md +++ b/content/os/installation/running-rancheros/cloud/gce/_index.md @@ -14,11 +14,8 @@ weight: 106 RancherOS is available as an image in GCE, and can be easily run in Google Compute Engine (GCE). Let’s walk through how to upload GCE image. 1. Download the most recent RancherOS image. The image can be found in the [release artifacts](https://github.com/rancher/os/releases). It is a `.tar.gz` file. - 2. Follow Google's instructions on how to [upload the image](https://cloud.google.com/compute/docs/tutorials/building-images#publishingimage). The image must be uploaded into a Google Cloud Storage bucket before it can be added to a project. - 3. Follow Google's instructions on how to [import a RAW image](https://cloud.google.com/compute/docs/images/import-existing-image#use_saved_image). - 4. Once the image is added to your Google Compute Engine, we can start creating new instances! ### Launching RancherOS using `gcloud compute` @@ -81,17 +78,11 @@ Updated [https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/ZONE_OF After the image is uploaded, it's easy to use the console to create new instances. You will **not** be able to upload your own cloud config file when creating instances through the console. You can add it after the instance is created using `gcloud compute` commands and resetting the instance. 1. Make sure you are in the project that the image was created in. - ![RancherOS on GCE 4]({{< baseurl >}}/img/os/Rancher_gce4.png) - 2. In the navigation bar, click on the **VM instances**, which is located at Compute -> Compute Engine -> Metadata. Click on **Create instance**. - ![RancherOS on GCE 5]({{< baseurl >}}/img/os/Rancher_gce5.png) - 2. Fill out the information for your instance. In the **Image** dropdown, your private image will be listed among the public images provided by Google. Select the private image for RancherOS. Click **Create**. - ![RancherOS on GCE 6]({{< baseurl >}}/img/os/Rancher_gce6.png) - 3. Your instance is being created and will be up and running shortly! #### Adding SSH keys diff --git a/content/os/installation/running-rancheros/server/raspberry-pi/_index.md b/content/os/installation/running-rancheros/server/raspberry-pi/_index.md index 341d2af3e9b..c8b66eaf97e 100644 --- a/content/os/installation/running-rancheros/server/raspberry-pi/_index.md +++ b/content/os/installation/running-rancheros/server/raspberry-pi/_index.md @@ -31,6 +31,5 @@ RancherOS does not currently expand the root partition to fill the remainder of 11. `sudo system-docker restart docker` to restart Docker using the new root If this is not a new installation, you'll have to copy over your existing Docker root (`/var/lib/docker`) to the new root (`/mnt/docker`). - 1. `sudo cp -R /var/lib/docker/* /mnt/docker` to recursively copy all files 2. `sudo system-docker restart docker` to restart Docker using the new root diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 9fc6f5192f1..4aa34796f51 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -21,7 +21,14 @@
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index acd50094809..707c7a09eab 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -21,7 +21,13 @@