docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update architectures in matrix (#10999) 

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-06-16 15:39:07 +02:00 committed by GitHub
parent e3c3484c47
commit 3e767a72b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
develop/develop-images/build_enhancements.md
View File

@ -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.

14
engine/install/index.md
View File

@ -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

27
engine/install/ubuntu.md
View File

@ -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.
<li class="active"><a data-toggle="tab" data-target="#x86_64_repo">x86_64 / amd64</a></li>
<li><a data-toggle="tab" data-target="#armhf_repo">armhf</a></li>
<li><a data-toggle="tab" data-target="#arm64_repo">arm64</a></li>
<li><a data-toggle="tab" data-target="#ppc64le_repo">ppc64le (IBM Power)</a></li>
<li><a data-toggle="tab" data-target="#s390x_repo">s390x (IBM Z)</a></li>
</ul>
<div class="tab-content">
<div id="x86_64_repo" class="tab-pane fade in active" markdown="1">
@ -162,26 +159,6 @@ from the repository.
stable"
```
</div>
<div id="ppc64le_repo" class="tab-pane fade" markdown="1">
```bash
$ sudo add-apt-repository \
"deb [arch=ppc64el] {{ download-url-base }} \
$(lsb_release -cs) \
stable"
```
</div>
<div id="s390x_repo" class="tab-pane fade" markdown="1">
```bash
$ sudo add-apt-repository \
"deb [arch=s390x] {{ download-url-base }} \
$(lsb_release -cs) \
stable"
```
</div>
</div> <!-- tab-content -->
@ -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,