소스 검색

Merge pull request #3346 from goodjack/patch-5

Upgrade the Compose file format version to Compose Specification
Shao Yu-Lung (Allen) 2 년 전
부모
커밋
badb1e89cd
4개의 변경된 파일6개의 추가작업 그리고 10개의 파일을 삭제
  1. 3 3
      DOCUMENTATION/content/getting-started/index.md
  2. 3 3
      README-zh.md
  3. 0 2
      docker-compose.sync.yml
  4. 0 2
      docker-compose.yml

+ 3 - 3
DOCUMENTATION/content/getting-started/index.md

@@ -7,7 +7,7 @@ weight: 2
 ## Requirements
 
 - [Git](https://git-scm.com/downloads)
-- [Docker](https://www.docker.com/products/docker/) [ >= 17.12 ]
+- [Docker](https://www.docker.com/products/docker-desktop/) [ >= 19.03.0 ]
 
 
 
@@ -148,12 +148,12 @@ If you use Chrome 63 or above for development, don't use `.dev`. [Why?](https://
 
 If you are using **Docker Toolbox** (VM), do one of the following:
 
-- Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](/documentation/#upgrading-laradock)
+- Upgrade to [Docker Desktop](https://www.docker.com/products/docker-desktop/) for Mac/Windows (Recommended). Check out [Upgrading Laradock](/documentation/#upgrading-laradock)
 - Use Laradock v3.\*. Visit the [Laradock-ToolBox](https://github.com/laradock/laradock/tree/LaraDock-ToolBox) branch. *(outdated)*
 
 <br>
 
-We recommend using a Docker version which is newer than 1.13. 
+We recommend using a Docker Engine version which is newer than 19.03.0.
 
 <br>
 

+ 3 - 3
README-zh.md

@@ -179,7 +179,7 @@ Homestead 是一个工具,为你控制虚拟机(使用 Homestead 特殊命令)
 ## 依赖
 
 - [Git](https://git-scm.com/downloads)       
-- [Docker](https://www.docker.com/products/docker/)
+- [Docker](https://www.docker.com/products/docker-desktop/)
 
 <a name="Installation"></a>
 ## 安装
@@ -205,9 +205,9 @@ git clone https://github.com/laradock/laradock.git
 
 **请在开始之前阅读:**
 如果你正在使用 **Docker Toolbox** (VM),选择以下任何一个方法:
-- 更新到 Docker [Native](https://www.docker.com/products/docker) Mac/Windows 版本 (建议). 查看 [Upgrading Laradock](#upgrading-laradock)
+- 更新到 [Docker Desktop](https://www.docker.com/products/docker-desktop/) Mac/Windows 版本 (建议). 查看 [Upgrading Laradock](#upgrading-laradock)
 - 使用 Laradock v3.* (访问 `Laradock-ToolBox` [分支](https://github.com/laradock/laradock/tree/Laradock-ToolBox)).
-如果您使用的是 **Docker Native**(Mac / Windows 版本)甚至是 Linux 版本,通常可以继续阅读这个文档,Laradock v4 以上版本将仅支持 **Docker Native**。
+如果您使用的是 **Docker Desktop**(Mac / Windows 版本)甚至是 Linux 版本,通常可以继续阅读这个文档,Laradock v4 以上版本将仅支持 **Docker Desktop**。
 
 1 - 运行容器: *(在运行 `docker-compose` 命令之前,确认你在 `laradock` 目录中*
 

+ 0 - 2
docker-compose.sync.yml

@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
 
 volumes:

+ 0 - 2
docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.5'
-
 networks:
   frontend:
     driver: ${NETWORKS_DRIVER}