From 33b75637e535c7e96b41480bb6e0b760ef86fc4d Mon Sep 17 00:00:00 2001 From: aiden Date: Mon, 15 Mar 2021 21:12:37 +1100 Subject: [PATCH 1/4] Renamed env-example to .env.example for conformity and IDE-compatibility; added PHP version 8.0 in the example values --- env-example => .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename env-example => .env.example (99%) diff --git a/env-example b/.env.example similarity index 99% rename from env-example rename to .env.example index 43f6a067..5be1e518 100644 --- a/env-example +++ b/.env.example @@ -38,7 +38,7 @@ COMPOSE_PROJECT_NAME=laradock ### PHP Version ########################################### # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). -# Accepted values: 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6 +# Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6 PHP_VERSION=7.3 ### Phalcon Version ########################################### From d759e82a02c950d141d396266972de944d76326a Mon Sep 17 00:00:00 2001 From: aiden Date: Tue, 23 Mar 2021 17:49:15 +1100 Subject: [PATCH 2/4] Renamed env-example to .env.example in documentation, reference and build files --- .github/workflows/main-ci.yml | 2 +- .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, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 90a692ac..e0edd735 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -15,5 +15,5 @@ jobs: env: PHP_VERSION: ${{ matrix.php_version }} run: | - cp env-example .env + cp .env.example .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 b96cdfe5..a16a9828 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.
-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 4466e3ab..c8adcfb2 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 461306c7..220d572b 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/PHPDBG=true/PHPDBG=false/g' .env From e7db566eee65891ea63551c05e8de0a50aa77e50 Mon Sep 17 00:00:00 2001 From: aiden Date: Mon, 15 Mar 2021 21:12:37 +1100 Subject: [PATCH 3/4] Renamed env-example to .env.example for conformity and IDE-compatibility; added PHP version 8.0 in the example values --- env-example => .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename env-example => .env.example (99%) diff --git a/env-example b/.env.example similarity index 99% rename from env-example rename to .env.example index 9ae14fc2..c3055bab 100644 --- a/env-example +++ b/.env.example @@ -38,7 +38,7 @@ COMPOSE_PROJECT_NAME=laradock ### PHP Version ########################################### # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). -# Accepted values: 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6 +# Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6 PHP_VERSION=7.3 ### Phalcon Version ########################################### From 844bd3d5d97bf6b0ac511d4da7d6695cd5f06d4f Mon Sep 17 00:00:00 2001 From: aiden Date: Tue, 23 Mar 2021 17:49:15 +1100 Subject: [PATCH 4/4] 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.
-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