Docker: Move .env.dist to .docker

Author: jgauthi

.env.dist renamed to .docker/compose/docker.env

@@ -11,4 +11,4 @@ DB_PORT=3306
 DB_NAME=demo
 DB_USER=local
 DB_PASS=local
-TIMEZONE=Europe/Paris
+TIMEZONE=Europe/Paris

.gitignore

@@ -1,6 +1,6 @@
 project/
 !project/.gitkeep
 .env
-!.env.dist
+!.docker/compose/.env.dist
 docker-compose.override.yml
 dump_*.sql

Makefile

@@ -28,7 +28,7 @@ help:
 sf: ## Symfony Command, example: `sf CMD="debug:router"`
 	@$(CONSOLE) $(CMD)
 
-up: docker-compose.override.yml up-ci  ## Start project with docker-compose + Dev env
+up: conf-env-file up-ci  ## Start project with docker-compose + Dev env
 
 stop:  ## Stop docker containers
 	@$(DOCKER_COMPOSE) stop
@@ -39,7 +39,7 @@ refresh: ## Remove and re-create docker containers (WITHOUT delete all data)
 
 restart: stop up-ci  ## Restart docker containers
 
-install: docker-compose.override.yml build up ## Create and start docker containers
+install: conf-env-file build up ## Create and start docker containers
 
 install-demo:
 	@$(EXEC_ROOT) chmod -R 775 /var/www
@@ -207,9 +207,9 @@ define echo_text
 	echo -e '\e[1;$(2)m$(1)\e[0m'
 endef
 
-docker-compose.override.yml:
+conf-env-file:
 ifeq (,$(wildcard .env))
-	@cp .env.dist .env
+	@cp .docker/compose/docker.env .env
 endif
 
 #docker-compose.override.yml: docker-compose.$(DOCKER_COMPOSE_OVERRIDE).yml

readme.md

@@ -12,6 +12,10 @@ A Docker image based on Ubuntu, serving PHP 8.1 FPM running as Nginx Module. Use
 Before use the docker version, check that ports 80/8080/443 are available. If an Apache / Nginx local server, another docker container are active, they can block access to these ports.
 
 ```shell script
+# [Optional] Before launch install, you can edit the docker .env
+make conf-env-file
+# edit .env
+
 make install
 
 # If symfony project is present on project folder