diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/_index.md index c1b8b6f6bb9..a65c2d4614e 100644 --- a/content/rancher/v2.x/en/installation/air-gap-installation/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-installation/_index.md @@ -37,13 +37,13 @@ We will cover two scenarios: 5. Complete installation of Rancher using the instructions in [Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install/). >**Note:** - > When completing [Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install/), you must prepend your private registry URL to the server tag that you use for installation. + > When completing [Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install/), prepend your private registry URL to the image when running the `docker run` command. > > Example: > ``` docker run -d --restart=unless-stopped \ -p 80:80 -p 443:443 \ - rancher/rancher:latest + /rancher/rancher:latest ``` #### Scenario 2: You have one host that can access both DockerHub and your private registry. @@ -54,27 +54,28 @@ We will cover two scenarios: 2. Pull all the images present in `rancher-images.txt`, re-tag each image with the location of your registry, and push the image to the registry. This will require at least 20GB of disk space. See an example script below: -``` + ``` #!/bin/sh IMAGES=`curl -s -L https://github.com/rancher/rancher/releases/download/v2.0.0/rancher-images.txt` for IMAGE in $IMAGES; do until docker inspect $IMAGE > /dev/null 2>&1; do docker pull $IMAGE done - docker tag $IMAGE registry.yourdomain.com:5000/$IMAGE - docker push registry.yourdomain.com:5000/$IMAGE + docker tag $IMAGE /$IMAGE + docker push /$IMAGE done -``` + ``` + 3. Complete installation of Rancher using the instructions in [Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install/). >**Note:** - > When completing [Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install/), you must prepend your private registry URL to the server tag that you use for installation. + > When completing [Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install/), prepend your private registry URL to the image when running the `docker run` command. > > Example: > ``` docker run -d --restart=unless-stopped \ -p 80:80 -p 443:443 \ - rancher/rancher:latest + /rancher/rancher:latest ``` @@ -86,12 +87,12 @@ Rancher needs to be configured to use the private registry as source for the nee ![Settings]({{< baseurl >}}/img/rancher/airgap/settings.png) 2. Look for the setting called `system-default-registry` and choose **Edit**. ![Edit]({{< baseurl >}}/img/rancher/airgap/edit-system-default-registry.png) -3. Change the value to your registry, i.e. `registry.yourdomain.com:5000`. Do not prefix the registry with `http://` or `https://` +3. Change the value to your registry, e.g. `registry.yourdomain.com:port`. Do not prefix the registry with `http://` or `https://` ![Save]({{< baseurl >}}/img/rancher/airgap/enter-system-default-registry.png) >**Note:** If you want to configure the setting when starting the rancher/rancher container, you can use the environment variable `CATTLE_SYSTEM_DEFAULT_REGISTRY`. Example: ``` #!/bin/sh -docker run -d -p 80:80 -p 443:443 -e CATTLE_SYSTEM_DEFAULT_REGISTRY=registry.yourdomain.com:5000 registry.yourdomain.com:5000/rancher/rancher:v2.0.0 +docker run -d -p 80:80 -p 443:443 -e CATTLE_SYSTEM_DEFAULT_REGISTRY= /rancher/rancher:v2.0.0 ``` diff --git a/content/rancher/v2.x/en/upgrades/air-gap-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/air-gap-upgrade/_index.md index 94af7c1afe2..097a644b2bb 100644 --- a/content/rancher/v2.x/en/upgrades/air-gap-upgrade/_index.md +++ b/content/rancher/v2.x/en/upgrades/air-gap-upgrade/_index.md @@ -6,11 +6,11 @@ To upgrade an air gapped Rancher Server, update your private registry with the l ## Upgrading An Air Gapped Rancher Server -1. Follow the directions in [Air Gap Installation]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/) to update the images required for the version of Rancher you want to upgrade to. +1. Follow the directions in Air Gap Installation to [pull the Docker images]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/#release-files) required for the new version of Rancher. 2. Follow the directions in [Single Node Upgrade]({{< baseurl >}}/rancher/v2.x/en/upgrades/single-node-upgrade/) to complete upgrade of your air gapped Rancher Server. >**Note:** - > While completing [Single Node Upgrade]({{< baseurl >}}/rancher/v2.x/en/upgrades/single-node-upgrade/), you must prepend your private registry URL to the server tag when running the upgrade command. + > While completing [Single Node Upgrade]({{< baseurl >}}/rancher/v2.x/en/upgrades/single-node-upgrade/), prepend your private registry URL to the image when running the `docker run` command. > > Example: `/rancher/rancher:latest` diff --git a/content/rancher/v2.x/en/upgrades/single-node-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/single-node-upgrade/_index.md index 2e509a67ccd..35a3b5b00fa 100644 --- a/content/rancher/v2.x/en/upgrades/single-node-upgrade/_index.md +++ b/content/rancher/v2.x/en/upgrades/single-node-upgrade/_index.md @@ -34,7 +34,7 @@ docker pull rancher/rancher:latest ``` >**Attention Air Gap Users:** - > If you are visiting this page to complete [Air Gap Upgrade]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-upgrade/), you must prepend your private registry URL to the server tag when running the upgrade command. + > If you are visiting this page to complete [Air Gap Upgrade]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-upgrade/), prepend your private registry URL to the image when running the `docker run` command. > > Example: `/rancher/rancher:latest` >