diff --git a/DOCUMENTATION/content/getting-started/index.md b/DOCUMENTATION/content/getting-started/index.md index a97c78c0..471f10e3 100644 --- a/DOCUMENTATION/content/getting-started/index.md +++ b/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)*
-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.
diff --git a/README-zh.md b/README-zh.md index c80e530b..da78b243 100644 --- a/README-zh.md +++ b/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/) ## 安装 @@ -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` 目录中* diff --git a/docker-compose.sync.yml b/docker-compose.sync.yml index c376c35b..97264c89 100644 --- a/docker-compose.sync.yml +++ b/docker-compose.sync.yml @@ -1,5 +1,3 @@ -version: '3.5' - services: volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 7da99250..8e6413f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.5' - networks: frontend: driver: ${NETWORKS_DRIVER}