From cc726421c85b9e872e64231c23765934b05de39e Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Sun, 20 Dec 2020 22:18:08 +0800 Subject: [PATCH] Update compose version Signed-off-by: Kang Huaishuai --- compose/install.md | 11 +++++++---- etcd/install.md | 4 ++++ manifest | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/compose/install.md b/compose/install.md index 92ae6fc..468a1a5 100644 --- a/compose/install.md +++ b/compose/install.md @@ -9,7 +9,7 @@ ```bash $ docker-compose --version -docker-compose version 1.25.5, build 4667896b +docker-compose version 1.27.4, build 40524192 ``` Linux 系统请使用以下介绍的方法安装。 @@ -21,7 +21,10 @@ Linux 系统请使用以下介绍的方法安装。 例如,在 Linux 64 位系统上直接下载对应的二进制包。 ```bash -$ sudo curl -L https://github.com/docker/compose/releases/download/1.25.5/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose +$ sudo curl -L https://github.com/docker/compose/releases/download/1.27.4/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose + +# 国内用户可以使用以下方式加快下载 +$ sudo curl -L https://download.fastgit.org/docker/compose/releases/download/1.27.4/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose $ sudo chmod +x /usr/local/bin/docker-compose ``` @@ -42,7 +45,7 @@ $ sudo pip install -U docker-compose ```bash Collecting docker-compose - Downloading docker-compose-1.25.5.tar.gz (149kB): 149kB downloaded + Downloading docker-compose-1.27.4.tar.gz (149kB): 149kB downloaded ... Successfully installed docker-compose cached-property requests texttable websocket-client docker-py dockerpty six enum34 backports.ssl-match-hostname ipaddress ``` @@ -50,7 +53,7 @@ Successfully installed docker-compose cached-property requests texttable websock ## bash 补全命令 ```bash -$ curl -L https://raw.githubusercontent.com/docker/compose/1.25.5/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose +$ curl -L https://raw.githubusercontent.com/docker/compose/1.27.4/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose ``` ## 卸载 diff --git a/etcd/install.md b/etcd/install.md index d188f5e..5366f1e 100644 --- a/etcd/install.md +++ b/etcd/install.md @@ -12,6 +12,10 @@ ```bash $ curl -L https://github.com/etcd-io/etcd/releases/download/v3.4.0/etcd-v3.4.0-linux-amd64.tar.gz -o etcd-v3.4.0-linux-amd64.tar.gz + +# 国内用户可以使用以下方式加快下载 +$ curl -L https://download.fastgit.org/etcd-io/etcd/releases/download/v3.4.0/etcd-v3.4.0-linux-amd64.tar.gz -o etcd-v3.4.0-linux-amd64.tar.gz + $ tar xzvf etcd-v3.4.0-linux-amd64.tar.gz $ cd etcd-v3.4.0-linux-amd64 ``` diff --git a/manifest b/manifest index 3edf306..107f15c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ DOCKER_VERSION=20.10.0 -DOCKER_COMPOSE_VERSION=1.25.5 +DOCKER_COMPOSE_VERSION=1.27.4 DOCKER_MACHINE_VERSION=0.16.1 ETCD_VERSION=3.4.0 KUBERNETES_VERSION=1.14.3