diff --git a/develop/develop-images/build_enhancements.md b/develop/develop-images/build_enhancements.md index a5b0750793..ee679509b5 100644 --- a/develop/develop-images/build_enhancements.md +++ b/develop/develop-images/build_enhancements.md @@ -24,14 +24,12 @@ For more information on build options, see the reference guide on the ## Requirements -* System requirements are docker-ce x86_64, ppc64le, s390x, aarch64, armhf; or - docker-ee x86_64 only +* A current version of Docker (18.09 or higher) * Network connection required for downloading images of custom frontends ## Limitations * Only supported for building Linux containers -* BuildKit mode is compatible with UCP 3.2 or newer ## To enable BuildKit builds @@ -184,7 +182,8 @@ $ docker build --no-cache --progress=plain --secret id=mysecret,src=mysecret.txt ## Using SSH to access private data in builds -> **Acknowledgment**: +> **Acknowledgment** +> > Please see [Build secrets and SSH forwarding in Docker 18.09](https://medium.com/@tonistiigi/build-secrets-and-ssh-forwarding-in-docker-18-09-ae8161d066) > for more information and examples. diff --git a/engine/install/index.md b/engine/install/index.md index b767a86d4e..8ff5dee203 100644 --- a/engine/install/index.md +++ b/engine/install/index.md @@ -39,13 +39,13 @@ your preferred operating system below. Docker provides `.deb` and `.rpm` packages from the following Linux distributions and architectures: -| Platform | x86_64 / amd64 | ARM | ARM64 / AARCH64 | IBM Power (ppc64le) | IBM Z (s390x) | -|:----------------------|:-----------------------|:-------------------------|:-----------------------|:-----------------------|:-----------------------| -| [CentOS](centos.md) | [{{ yes }}](centos.md) | | [{{ yes }}](centos.md) | | | -| [Debian](debian.md) | [{{ yes }}](debian.md) | [{{ yes }}](debian.md) | [{{ yes }}](debian.md) | | | -| [Fedora](fedora.md) | [{{ yes }}](fedora.md) | | [{{ yes }}](fedora.md) | | | -| [Raspbian](debian.md) | | [{{ yes }}](debian.md) | [{{ yes }}](debian.md) | | | -| [Ubuntu](ubuntu.md) | [{{ yes }}](ubuntu.md) | [{{ yes }}](ubuntu.md) | [{{ yes }}](ubuntu.md) | [{{ yes }}](ubuntu.md) | [{{ yes }}](ubuntu.md) | +| Platform | x86_64 / amd64 | ARM | ARM64 / AARCH64 | +|:----------------------|:-----------------------|:-------------------------|:-----------------------| +| [CentOS](centos.md) | [{{ yes }}](centos.md) | | [{{ yes }}](centos.md) | +| [Debian](debian.md) | [{{ yes }}](debian.md) | [{{ yes }}](debian.md) | [{{ yes }}](debian.md) | +| [Fedora](fedora.md) | [{{ yes }}](fedora.md) | | [{{ yes }}](fedora.md) | +| [Raspbian](debian.md) | | [{{ yes }}](debian.md) | [{{ yes }}](debian.md) | +| [Ubuntu](ubuntu.md) | [{{ yes }}](ubuntu.md) | [{{ yes }}](ubuntu.md) | [{{ yes }}](ubuntu.md) | ##### Other Linux distributions diff --git a/engine/install/ubuntu.md b/engine/install/ubuntu.md index ce6c8a877b..4374a18057 100644 --- a/engine/install/ubuntu.md +++ b/engine/install/ubuntu.md @@ -29,8 +29,7 @@ versions: - Ubuntu Bionic 18.04 (LTS) - Ubuntu Xenial 16.04 (LTS) -Docker Engine is supported on `x86_64` (or `amd64`), `armhf`, `arm64`, `s390x` -(IBM Z), and `ppc64le` (IBM Power) architectures. +Docker Engine is supported on `x86_64` (or `amd64`), `armhf`, and `arm64` architectures. ### Uninstall old versions @@ -129,8 +128,6 @@ from the repository.
  • x86_64 / amd64
  • armhf
  • arm64
  • -
  • ppc64le (IBM Power)
  • -
  • s390x (IBM Z)
  • @@ -162,26 +159,6 @@ from the repository. stable" ``` -
    -
    - - ```bash - $ sudo add-apt-repository \ - "deb [arch=ppc64el] {{ download-url-base }} \ - $(lsb_release -cs) \ - stable" - ``` - -
    -
    - - ```bash - $ sudo add-apt-repository \ - "deb [arch=s390x] {{ download-url-base }} \ - $(lsb_release -cs) \ - stable" - ``` -
    @@ -253,7 +230,7 @@ a new file each time you want to upgrade Docker. 1. Go to [`{{ download-url-base }}/dists/`]({{ download-url-base }}/dists/){: target="_blank" class="_" }, choose your Ubuntu version, then browse to `pool/stable/`, choose `amd64`, - `armhf`, `arm64`, `ppc64el`, or `s390x`, and download the `.deb` file for the + `armhf`, or `arm64`, and download the `.deb` file for the Docker Engine version you want to install. > **Note**: To install a **nightly** or **test** (pre-release) package,