Merge pull request #2883 from aydin41k/update-env-example
Renamed env-example for IDE-compatibity; added PHP version 8.0 in the example values
This commit is contained in:
commit
9a48ed7dae
@ -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 ###########################################
|
4
.github/workflows/main-ci.yml
vendored
4
.github/workflows/main-ci.yml
vendored
@ -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 }}
|
||||
|
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@ -1,6 +1,6 @@
|
||||
{
|
||||
"files.associations": {
|
||||
"env-example": "dotenv",
|
||||
".env.example": "dotenv",
|
||||
"Dockerfile-*": "dockerfile"
|
||||
}
|
||||
}
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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.
|
||||
|
@ -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:
|
||||
|
@ -70,7 +70,7 @@ git clone https://github.com/laradock/laradock.git
|
||||
|
||||
2. 进入 Laradock 目录
|
||||
```bash
|
||||
cp env-example .env
|
||||
cp .env.example .env
|
||||
```
|
||||
|
||||
3. 运行这些容器。
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user