Merge branch 'master' into add-portal-https-guide

apolloconfig · Dec 11, 2022 · 17d3e81 · 17d3e81
2 parents fa17822 + 8ddbe0a
commit 17d3e81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/docs/en/deployment/quick-start-docker.md b/docs/en/deployment/quick-start-docker.md
@@ -18,6 +18,8 @@ To speed up Docker image download, it is recommended to [configure image gas ped
 
 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.
 
+> 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)
+
 ```bash
 - docker-quick-start
   - docker-compose.yml
@@ -30,6 +32,8 @@ Download [docker-compose.yml](https://github.com/apolloconfig/apollo-quick-start
 
 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.
 
+> If you are using a machine with an ARM architecture, such as a Mac M1, execute `docker-compose -f docker-compose-arm64.yml up`
+
 Search all the logs starting with `apollo-quick-start` and see the following logs indicating a successful start.
 ```log
 apollo-quick-start | ==== starting service ====

diff --git a/docs/zh/deployment/quick-start-docker.md b/docs/zh/deployment/quick-start-docker.md
@@ -18,6 +18,8 @@ docker -v
 
 下载[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。
 
+> 如果使用的是 arm 架构的机器，例如 mac m1，需要下载[docker-compose-arm64.yml](https://github.com/apolloconfig/apollo-quick-start/blob/master/docker-compose-arm64.yml)
+
 ```bash
 - docker-quick-start
   - docker-compose.yml
@@ -30,6 +32,8 @@ docker -v
 
 在docker-quick-start目录下执行`docker-compose up`，第一次执行会触发下载镜像等操作，需要耐心等待一些时间。
 
+> 如果使用的是 arm 架构的机器，例如 mac m1，执行 `docker-compose -f docker-compose-arm64.yml up`
+
 搜索所有`apollo-quick-start`开头的日志，看到以下日志说明启动成功：
 ```log
 apollo-quick-start    | ==== starting service ====