From 7eb11d85376a0bca7571233bc15697b54b97fb75 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Wed, 7 Jun 2017 12:25:44 -0700 Subject: [PATCH] Add s390x info --- engine/installation/linux/docker-ce/debian.md | 14 ++++++--- engine/installation/linux/docker-ce/ubuntu.md | 29 ++++++++++++++----- engine/installation/linux/docker-ee/ubuntu.md | 26 ++++++++++------- 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/engine/installation/linux/docker-ce/debian.md b/engine/installation/linux/docker-ce/debian.md index c0c4fa7f8b..4da2a30a8b 100644 --- a/engine/installation/linux/docker-ce/debian.md +++ b/engine/installation/linux/docker-ce/debian.md @@ -85,7 +85,13 @@ from the repository. {% assign download-url-base = "https://download.docker.com/linux/debian" %} -1. Install packages to allow `apt` to use a repository over HTTPS: +1. Update the `apt` package index: + + ```bash + $ sudo apt-get update + ``` + +2. Install packages to allow `apt` to use a repository over HTTPS: **Jessie or Stretch**: @@ -108,7 +114,7 @@ from the repository. python-software-properties ``` -2. Add Docker's official GPG key: +3. Add Docker's official GPG key: ```bash $ curl -fsSL {{ download-url-base}}/gpg | sudo apt-key add - @@ -125,7 +131,7 @@ from the repository. sub 4096R/F273FCD8 2017-02-22 ``` -3. Use the following command to set up the **stable** repository. You always +4. Use the following command to set up the **stable** repository. You always need the **stable** repository, even if you want to install **edge** builds as well. @@ -152,7 +158,7 @@ from the repository. sudo tee /etc/apt/sources.list.d/docker.list ``` -4. **Wheezy only**: The version of `add-apt-repository` on Wheezy adds a `deb-src` +5. **Wheezy only**: The version of `add-apt-repository` on Wheezy adds a `deb-src` repository that does not exist. You need to comment out this repository or running `apt-get update` will fail. Edit `/etc/apt/sources.list`. Find the line like the following, and comment it out or remove it: diff --git a/engine/installation/linux/docker-ce/ubuntu.md b/engine/installation/linux/docker-ce/ubuntu.md index 58495cd61c..d3a2b00784 100644 --- a/engine/installation/linux/docker-ce/ubuntu.md +++ b/engine/installation/linux/docker-ce/ubuntu.md @@ -30,11 +30,16 @@ To learn more about Docker EE, see To install Docker CE, you need the 64-bit version of one of these Ubuntu versions: +- Zesty 17.04 (LTS) - Yakkety 16.10 - Xenial 16.04 (LTS) - Trusty 14.04 (LTS) -Docker CE is supported on both `x86_64` and `armhf` architectures. +Docker CE is supported on Ubuntu on `x86_64`, `armhf`, and `s390x` (IBM z +Systems) architectures. + +> **`s390x` limitations**: System Z is only supported on Ubuntu Xenial, +> Yakkety, and Zesty. ### Uninstall old versions @@ -106,7 +111,7 @@ the repository. software-properties-common ``` -2. Add Docker's official GPG key: +3. Add Docker's official GPG key: ```bash $ curl -fsSL {{ download-url-base }}/gpg | sudo apt-key add - @@ -123,7 +128,7 @@ the repository. sub 4096R/F273FCD8 2017-02-22 ``` -3. Use the following command to set up the **stable** repository. You always +4. Use the following command to set up the **stable** repository. You always need the **stable** repository, even if you want to install **edge** builds as well. @@ -153,6 +158,16 @@ the repository. stable" ``` + **s390x**: + + ```bash + $ sudo add-apt-repository \ + "deb [arch=s390x] {{ download-url-base }} \ + $(lsb_release -cs) \ + stable" + ``` + + [Learn about **stable** and **edge** channels](/engine/installation/). @@ -229,10 +244,10 @@ If you cannot use Docker's repository to install Docker CE, you can download the `.deb` file for your release and install it manually. You will need to download a new file each time you want to upgrade Docker CE. -1. Go to [{{ download-url-base }}/dists/]({{ download-url-base }}/dists/), choose your - Ubuntu version, browse to `pool/stable/`, choose either `amd64` or - `armhf`,and download the `.deb` file for the Docker version you want to - install and for your version of Ubuntu. +1. Go to [{{ download-url-base }}/dists/]({{ download-url-base }}/dists/), + choose your Ubuntu version, browse to `pool/stable/` and choose `amd64`, + `armhf`, or `s390x`. Download the `.deb` file for the Docker version you + want to install and for your version of Ubuntu. > **Note**: To install an **edge** package, change the word > `stable` in the URL to `edge`. diff --git a/engine/installation/linux/docker-ee/ubuntu.md b/engine/installation/linux/docker-ee/ubuntu.md index 7708d66744..1eec7ebcd5 100644 --- a/engine/installation/linux/docker-ee/ubuntu.md +++ b/engine/installation/linux/docker-ee/ubuntu.md @@ -94,17 +94,23 @@ from the repository. #### Set up the repository -1. Install packages to allow `apt` to use a repository over HTTPS: +1. Update the `apt` package index: - ```bash - $ sudo apt-get install \ - apt-transport-https \ - ca-certificates \ - curl \ - software-properties-common - ``` + ```bash + $ sudo apt-get update + ``` -2. Add Docker's official GPG key using your customer Docker EE repository URL: +2. Install packages to allow `apt` to use a repository over HTTPS: + + ```bash + $ sudo apt-get install \ + apt-transport-https \ + ca-certificates \ + curl \ + software-properties-common + ``` + +3. Add Docker's official GPG key using your customer Docker EE repository URL: ```bash $ curl -fsSL /gpg | sudo apt-key add - @@ -121,7 +127,7 @@ from the repository. sub 4096R/91A29FA3 2017-02-22 ``` -3. Use the following command to set up the **stable** repository, replacing +4. Use the following command to set up the **stable** repository, replacing `` with the URL you noted down in the [prerequisites](#prerequisites).