Docker: Move compose file on .docker/compose

Author: jgauthi

docker-compose.dev.yml renamed to .docker/compose/base-dev.yml

@@ -2,7 +2,7 @@ version: '3.6'
 services:
   db:
     build:
-      context: .docker/mysql
+      context: ../mysql
       args:
         MYSQL_USER: ${DB_USER}
         MYSQL_PASSWORD: ${DB_PASS}
@@ -27,8 +27,8 @@ services:
     ports:
       - 80
     volumes:
-      - ./.docker/phpmyadmin/config.inc.php:/etc/phpmyadmin/config.user.inc.php
-      - ./.docker/phpmyadmin/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
+      - ./../phpmyadmin/config.inc.php:/etc/phpmyadmin/config.user.inc.php
+      - ./../phpmyadmin/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
     depends_on:
       - db
     links:

docker-compose.yml renamed to .docker/compose/base.yml

@@ -12,9 +12,9 @@ services:
       - 80
       - 443
     volumes:
-      - ./project:/var/www/project/demo
-      - ./.docker/nginx/nginx.conf:/etc/nginx/nginx.conf
-      - ./.docker/nginx/sites:/etc/nginx/sites-enabled
+      - ../../project:/var/www/project/demo
+      - ../nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ../nginx/sites:/etc/nginx/sites-enabled
     restart: unless-stopped
     depends_on:
       - php
@@ -39,7 +39,7 @@ services:
       - sfdemo
 
   php:
-    build: .docker/php
+    build: ../php
     restart: unless-stopped
     environment:
       MYSQL_HOST: ${DB_HOST}
@@ -48,7 +48,7 @@ services:
       MYSQL_PORT: ${DB_PORT}
       MYSQL_DATABASE: ${DB_NAME}
     volumes:
-      - ./project:/var/www/project/demo
+      - ../../project:/var/www/project/demo
       - ~/.cache/composer:/.composer # Share composer cache
     depends_on:
       - db

.env.dist

@@ -1,46 +1,14 @@
-# In all environments, the following files are loaded if they exist,
-# the later taking precedence over the former:
-#
-#  * .env                contains default values for the environment variables needed by the app
-#  * .env.local          uncommitted file with local overrides
-#  * .env.$APP_ENV       committed environment-specific defaults
-#  * .env.$APP_ENV.local uncommitted environment-specific overrides
-#
-# Real environment variables win over .env files.
-#
-# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
-#
-# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
-# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
-
-###> symfony/framework-bundle ###
-APP_ENV=dev
-APP_SECRET=1c033cf04c8c84f016ffa88768ee165a
-#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
-#TRUSTED_HOSTS='^localhost|example\.com$'
-###< symfony/framework-bundle ###
+# Docker Configuration
+COMPOSE_PATH_SEPARATOR=;
+COMPOSE_PROJECT_NAME=sfdemo
+COMPOSE_FILE=.docker/compose/base.yml;.docker/compose/base-dev.yml
+# VOLUME_USER_ID=1001 # You can set your Linux UserID (command: id -u)
+# COMPOSER_HOME=/home/$user/.cache/composer/  # You can set your composer folder, change $user by your username
 
-###> doctrine/doctrine-bundle ###
-# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
-# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
-#
+# Database Configuration
 DB_HOST=db
 DB_PORT=3306
 DB_NAME=demo
 DB_USER=local
 DB_PASS=local
-DATABASE_URL=mysql://${DB_USER}:${DB_PASS}@${DB_HOST}:${DB_PORT}/${DB_NAME}?serverVersion=8
-TIMEZONE=Europe/Paris
-###< doctrine/doctrine-bundle ###
-
-###> Docker config ###
-COMPOSE_PROJECT_NAME=sfdemo
-# VOLUME_USER_ID=1001 # You can set your Linux UserID (command: id -u)
-# COMPOSER_HOME=/home/$user/.cache/composer/  # You can set your composer folder, change $user by your username
-
-# A transférer dans doctrine
-MYSQL_DATABASE=demo
-MYSQL_USER=local
-MYSQL_PASSWORD=local
-MYSQL_PORT=3306
-###< Docker database conf ###
+TIMEZONE=Europe/Paris

Makefile

@@ -65,8 +65,8 @@ uninstall: clear stop  ## Remove docker containers
 reset: uninstall install  ## Remove and re-create docker containers
 
 clear-cache: perm  ## Clear + Prepare Cache (alias: c:c), you can specify the env: ENV=prod
-	@$(CONSOLE) cache:clear --no-warmup --env=$(APP_ENV)
-	@$(CONSOLE) cache:warmup --env=$(APP_ENV)
+	@$(CONSOLE) cache:clear --no-warmup
+	@$(CONSOLE) cache:warmup
 
 c\:c: clear-cache
 
@@ -110,10 +110,10 @@ db-create-migration: ## Create migration
 	@$(CONSOLE) make:migration
 
 db-migrate:  ## Migrate database schema to the latest available version
-	@$(CONSOLE) doctrine:migration:migrate -n --env=$(APP_ENV)
+	@$(CONSOLE) doctrine:migration:migrate -n
 
 db-rollback:  ## Rollback the latest executed migration
-	@$(CONSOLE) doctrine:migration:migrate prev -n --env=$(APP_ENV)
+	@$(CONSOLE) doctrine:migration:migrate prev -n
 
 db-validate:  ## Check the ORM mapping
 	@$(CONSOLE) doctrine:schema:validate
@@ -122,7 +122,7 @@ db-create-database: ## Create database if not exists
 	@$(CONSOLE) doctrine:database:create --if-not-exists
 
 db-fixtures:  ## Apply doctrine fixtures
-	@$(CONSOLE) doctrine:fixtures:load -n --env=$(APP_ENV)
+	@$(CONSOLE) doctrine:fixtures:load -n
 
 db-install: db-create-database db-migrate db-fixtures ## Drop and install database with schema + fixtures
 
@@ -207,13 +207,18 @@ define echo_text
 	echo -e '\e[1;$(2)m$(1)\e[0m'
 endef
 
-docker-compose.override.yml: docker-compose.$(DOCKER_COMPOSE_OVERRIDE).yml
+docker-compose.override.yml:
 ifeq (,$(wildcard .env))
 	@cp .env.dist .env
 endif
-	@test -f docker-compose.override.yml \
-		&& $(call echo_text,/!\ docker-compose.$(DOCKER_COMPOSE_OVERRIDE).yml might have been modified - remove docker-compose.override.yml to be up-to-date,31) \
-		|| ( echo "Copy docker-compose.override.yml from docker-compose.$(DOCKER_COMPOSE_OVERRIDE).yml"; cp docker-compose.$(DOCKER_COMPOSE_OVERRIDE).yml docker-compose.override.yml )
+
+#docker-compose.override.yml: docker-compose.$(DOCKER_COMPOSE_OVERRIDE).yml
+#ifeq (,$(wildcard .env))
+#	@cp .env.dist .env
+#endif
+#	@test -f docker-compose.override.yml \
+#		&& $(call echo_text,/!\ docker-compose.$(DOCKER_COMPOSE_OVERRIDE).yml might have been modified - remove docker-compose.override.yml to be up-to-date,31) \
+#		|| ( echo "Copy docker-compose.override.yml from docker-compose.$(DOCKER_COMPOSE_OVERRIDE).yml"; cp docker-compose.$(DOCKER_COMPOSE_OVERRIDE).yml docker-compose.override.yml )
 
 
 #node_modules: yarn.lock