Skip to content

Commit

Permalink
Update compose version
Browse files Browse the repository at this point in the history
Signed-off-by: Kang Huaishuai <[email protected]>
  • Loading branch information
khs1994 committed Dec 20, 2020
1 parent 47e83e7 commit cc72642
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
11 changes: 7 additions & 4 deletions compose/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 系统请使用以下介绍的方法安装
Expand All @@ -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
```
Expand All @@ -42,15 +45,15 @@ $ 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
```
## 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
```
## 卸载
Expand Down
4 changes: 4 additions & 0 deletions etcd/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion manifest
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit cc72642

Please sign in to comment.