From 1720aae2a2a535f3473440efc3211c72bb8beb76 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 2 Oct 2021 15:39:32 +0800 Subject: [PATCH] Simplify Debian & Ubuntu Docker Engine installation guide --- engine/install/debian.md | 31 +----------------------------- engine/install/ubuntu.md | 41 +--------------------------------------- 2 files changed, 2 insertions(+), 70 deletions(-) diff --git a/engine/install/debian.md b/engine/install/debian.md index 06e3ecaf2a..dd16ccc3d9 100644 --- a/engine/install/debian.md +++ b/engine/install/debian.md @@ -107,41 +107,12 @@ from the repository. > `BunsenLabs Linux Helium`, you could use `stretch`. Docker does not offer any guarantees on untested > and unsupported Debian distributions. - -
-
- ```console $ echo \ - "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \ + "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \ $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null ``` -
-
- - ```console - $ echo \ - "deb [arch=armhf signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \ - $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - ``` - -
-
- - ```console - $ echo \ - "deb [arch=arm64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \ - $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - ``` - -
-
- #### Install Docker Engine This procedure works for Debian on `x86_64` / `amd64`, `armhf`, `arm64`, and Raspbian. diff --git a/engine/install/ubuntu.md b/engine/install/ubuntu.md index 1d33c5eb90..eb08334052 100644 --- a/engine/install/ubuntu.md +++ b/engine/install/ubuntu.md @@ -124,51 +124,12 @@ from the repository. > `Linux Mint Tessa`, you could use `bionic`. Docker does not offer any guarantees on untested > and unsupported Ubuntu distributions. - -
-
- ```console $ echo \ - "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \ + "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \ $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null ``` -
-
- - ```console - $ echo \ - "deb [arch=armhf signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \ - $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - ``` - -
-
- - ```console - $ echo \ - "deb [arch=arm64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \ - $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - ``` - -
-
- - ```console - $ echo \ - "deb [arch=s390x signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \ - $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - ``` - -
-
- #### Install Docker Engine 1. Update the `apt` package index, and install the _latest version_ of Docker