Skip to content

Commit 10e72ca

Browse files
authored
Merge branch 'master' into eureka-server-security
2 parents fd96c72 + 8ddbe0a commit 10e72ca

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

docs/en/deployment/quick-start-docker.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ To speed up Docker image download, it is recommended to [configure image gas ped
1818

1919
Download [docker-compose.yml](https://github.com/apolloconfig/apollo-quick-start/blob/master/docker-compose.yml) and [sql folder](https://github.com/apolloconfig/apollo-quick-start/tree/master/sql) to a local directory, such as docker-quick-start.
2020

21+
> If you are using a machine with an ARM architecture, such as a Mac M1, you will need to download [docker-compose-arm64.yml](https://github.com/apolloconfig/apollo-quick-start/blob/master/docker-compose-arm64.yml)
22+
2123
```bash
2224
- docker-quick-start
2325
- docker-compose.yml
@@ -30,6 +32,8 @@ Download [docker-compose.yml](https://github.com/apolloconfig/apollo-quick-start
3032

3133
Execute `docker-compose up` in the docker-quick-start directory, the first execution will trigger downloading images and other operations, you need to be patient and wait for some time.
3234

35+
> If you are using a machine with an ARM architecture, such as a Mac M1, execute `docker-compose -f docker-compose-arm64.yml up`
36+
3337
Search all the logs starting with `apollo-quick-start` and see the following logs indicating a successful start.
3438
```log
3539
apollo-quick-start | ==== starting service ====

docs/zh/deployment/quick-start-docker.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ docker -v
1818

1919
下载[docker-compose.yml](https://github.com/apolloconfig/apollo-quick-start/blob/master/docker-compose.yml)[sql 文件夹](https://github.com/apolloconfig/apollo-quick-start/tree/master/sql)到本地目录,如 docker-quick-start。
2020

21+
> 如果使用的是 arm 架构的机器,例如 mac m1,需要下载[docker-compose-arm64.yml](https://github.com/apolloconfig/apollo-quick-start/blob/master/docker-compose-arm64.yml)
22+
2123
```bash
2224
- docker-quick-start
2325
- docker-compose.yml
@@ -30,6 +32,8 @@ docker -v
3032

3133
在docker-quick-start目录下执行`docker-compose up`,第一次执行会触发下载镜像等操作,需要耐心等待一些时间。
3234

35+
> 如果使用的是 arm 架构的机器,例如 mac m1,执行 `docker-compose -f docker-compose-arm64.yml up`
36+
3337
搜索所有`apollo-quick-start`开头的日志,看到以下日志说明启动成功:
3438
```log
3539
apollo-quick-start | ==== starting service ====

0 commit comments

Comments
 (0)