From 844bd3d5d97bf6b0ac511d4da7d6695cd5f06d4f Mon Sep 17 00:00:00 2001
From: aiden <aydin4ik@gmail.com>
Date: Tue, 23 Mar 2021 17:49:15 +1100
Subject: [PATCH] Resolved conflicts with the latest version

---
 .github/workflows/main-ci.yml                  | 4 ++--
 .vscode/settings.json                          | 2 +-
 DOCUMENTATION/content/contributing/index.md    | 2 +-
 DOCUMENTATION/content/getting-started/index.md | 6 +++---
 DOCUMENTATION/content/introduction/index.md    | 4 ++--
 README-zh.md                                   | 2 +-
 travis-build.sh                                | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml
index fd2f6c79..b05020fd 100644
--- a/.github/workflows/main-ci.yml
+++ b/.github/workflows/main-ci.yml
@@ -23,7 +23,7 @@ jobs:
         PHP_VERSION: ${{ matrix.php_version }}
       run: |
         set -eux
-        cp env-example .env
+        cp .env.example .env
         sed -i -- 's/=false/=true/g' .env
         sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
         sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env
@@ -51,7 +51,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build the Docker image
       run: |
-        cp env-example .env
+        cp .env.example .env
         sed -i -- 's/=false/=true/g' .env
         sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
         docker-compose build ${{ matrix.service }}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1166680a..3f259ad1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
     "files.associations": {
-        "env-example": "dotenv",
+        ".env.example": "dotenv",
         "Dockerfile-*": "dockerfile"
     }
 }
diff --git a/DOCUMENTATION/content/contributing/index.md b/DOCUMENTATION/content/contributing/index.md
index 4a39b2de..b2d05d61 100644
--- a/DOCUMENTATION/content/contributing/index.md
+++ b/DOCUMENTATION/content/contributing/index.md
@@ -81,7 +81,7 @@ To update the sidebar or add a new section to it, you can edit this `DOCUMENTATI
 
 * Make sure you follow the same code/comments style.
 
-* Add the environment variables to the `env-example` if you have any.
+* Add the environment variables to the `.env.example` if you have any.
 
 * **MOST IMPORTANTLY** update the `Documentation`, add as much information.
 
diff --git a/DOCUMENTATION/content/getting-started/index.md b/DOCUMENTATION/content/getting-started/index.md
index 1278d65b..12ec826a 100644
--- a/DOCUMENTATION/content/getting-started/index.md
+++ b/DOCUMENTATION/content/getting-started/index.md
@@ -75,7 +75,7 @@ Your folder structure should look like this:
 We'll need to do step 1 of the [Usage](#Usage) section now to make this happen.
 
 ```
-cp env-example .env
+cp .env.example .env
 ```
 
 At the top, change the `APP_CODE_PATH_HOST` variable to your project path.
@@ -155,10 +155,10 @@ We recommend using a Docker version which is newer than 1.13.
 
 <br>
 
-1 - Enter the laradock folder and copy `env-example` to `.env`
+1 - Enter the laradock folder and copy `.env.example` to `.env`
 
 ```shell
-cp env-example .env
+cp .env.example .env
 ```
 
 You can edit the `.env` file to choose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are being used.
diff --git a/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md
index d53cca8f..6c886567 100644
--- a/DOCUMENTATION/content/introduction/index.md
+++ b/DOCUMENTATION/content/introduction/index.md
@@ -46,10 +46,10 @@ Let's see how easy it is to setup our demo stack `PHP`, `NGINX`, `MySQL`, `Redis
 git clone https://github.com/Laradock/laradock.git
 ```
 
-2 - Enter the laradock folder and rename `env-example` to `.env`.
+2 - Enter the laradock folder and rename `.env.example` to `.env`.
 
 ```shell
-cp env-example .env
+cp .env.example .env
 ```
 
 3 - Run your containers:
diff --git a/README-zh.md b/README-zh.md
index e50794b7..6055f2df 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -70,7 +70,7 @@ git clone https://github.com/laradock/laradock.git
 
 2. 进入 Laradock 目录
  ```bash
-cp env-example .env
+cp .env.example .env
 ```
 
 3. 运行这些容器。
diff --git a/travis-build.sh b/travis-build.sh
index 7d5cd711..b86105d2 100755
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -11,7 +11,7 @@ env | sort
 
 #### Build the Docker Images
 if [ -n "${PHP_VERSION}" ]; then
-    cp env-example .env
+    cp .env.example .env
     sed -i -- "s/PHP_VERSION=.*/PHP_VERSION=${PHP_VERSION}/g" .env
     sed -i -- 's/=false/=true/g' .env
     sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env