fix: use gpg --dearmor instead of apt-key

This commit is contained in:
Sherkey 2022-05-02 19:41:56 +08:00
parent 07dc2fa666
commit 177ec1025d

View File

@ -11,12 +11,12 @@ category: help
### Debian/Ubuntu 用户
以下内容根据 [官方文档](https://docs.docker.com/engine/installation/linux/docker-ce/debian/) 修改而来。
以下内容根据 [官方文档](https://docs.docker.com/engine/install/debian/) 修改而来。
如果你过去安装过 docker先删掉:
```bash
sudo apt-get remove docker docker-engine docker.io
sudo apt-get remove docker docker-engine docker.io containerd runc
```
首先安装依赖:
@ -40,7 +40,7 @@ sudo apt-get install apt-transport-https ca-certificates curl gnupg2 software-pr
{% raw %}
<p></p>
<pre>
<code id="deb-gpg-content">curl -fsSL https://download.docker.com/linux/{{ deb_release }}/gpg | sudo apt-key add -</code>
<code id="deb-gpg-content">curl -fsSL https://download.docker.com/linux/{{ deb_release }}/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg</code>
</pre>
{% endraw %}
@ -51,7 +51,7 @@ sudo apt-get install apt-transport-https ca-certificates curl gnupg2 software-pr
<p></p>
<pre>
<code class="language-bash" id="deb-amd64-content">sudo add-apt-repository \
"deb [arch=amd64] https://{%endraw%}{{ site.hostname }}{%raw%}/docker-ce/linux/{{deb_release}} \
"deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://{%endraw%}{{ site.hostname }}{%raw%}/docker-ce/linux/{{deb_release}} \
$(lsb_release -cs) \
stable"</code>
</pre>
@ -63,7 +63,7 @@ sudo apt-get install apt-transport-https ca-certificates curl gnupg2 software-pr
{% raw %}
<p></p>
<pre>
<code id="deb-arm-content">echo "deb [arch=armhf] https://{%endraw%}{{ site.hostname }}{%raw%}/docker-ce/linux/{{deb_release}} \
<code id="deb-arm-content">echo "deb [arch=armhf signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://{%endraw%}{{ site.hostname }}{%raw%}/docker-ce/linux/{{deb_release}} \
$(lsb_release -cs) stable" | \
sudo tee /etc/apt/sources.list.d/docker.list</code>
</pre>
@ -78,18 +78,18 @@ sudo apt-get install docker-ce
### Fedora/CentOS/RHEL
以下内容根据 [官方文档](https://docs.docker.com/engine/installation/linux/docker-ce/centos/) 修改而来。
以下内容根据 [官方文档](https://docs.docker.com/engine/install/centos/) 修改而来。
如果你之前安装过 docker请先删掉
```bash
sudo yum remove docker docker-common docker-selinux docker-engine
sudo yum remove docker docker-client docker-client-latest docker-common docker-latest docker-latest-logrotate docker-logrotate docker-engine
```
安装一些依赖
```bash
sudo yum install -y yum-utils device-mapper-persistent-data lvm2 wget
sudo yum install -y yum-utils device-mapper-persistent-data lvm2
```
<form class="form-inline">
@ -105,7 +105,7 @@ sudo yum install -y yum-utils device-mapper-persistent-data lvm2 wget
{% raw %}
<p></p>
<pre>
<code id="yum-content">wget -O /etc/yum.repos.d/docker-ce.repo https://download.docker.com/linux/{{ yum_release }}/docker-ce.repo</code>
<code id="yum-content">yum-config-manager --add-repo https://download.docker.com/linux/{{ yum_release }}/docker-ce.repo</code>
</pre>
{% endraw %}