Makefile: add current user/group, fix #3

Author: jgauthi

Makefile

@@ -5,7 +5,9 @@ ifneq ("$(wildcard .env)","")
 endif
 
 # Init var
-DOCKER_COMPOSE?=docker-compose
+user := $(shell id -u)
+group := $(shell id www-data -g)
+DOCKER_COMPOSE := USER_ID=$(user) GROUP_ID=$(group) docker-compose
 EXEC?=$(DOCKER_COMPOSE) exec php
 EXEC_ROOT?=$(DOCKER_COMPOSE) exec -u root php
 CONSOLE=bin/console
@@ -41,6 +43,12 @@ install-demo:
 	@$(EXEC_ROOT) bash -c "mv demo/* . && rm -rf demo/ data/"
 	@make restart perm db-create-migration db-install clear-cache
 
+install-prod:
+	APP_ENV=prod APP_DEBUG=0 $(call composer,install --no-dev --optimize-autoloader)
+	APP_ENV=prod make clear-cache
+	APP_ENV=prod APP_DEBUG=0 @$(EXEC) $(CONSOLE) cache:clear
+	@$(EXEC) $(CONSOLE) cache:pool:clear cache.global_clearer
+
 status:  ## Docker container status
 	@$(DOCKER_COMPOSE) ps
 

docker-compose.yml

@@ -15,7 +15,7 @@ services:
       - ./project:/var/www
       - ./.docker/nginx/nginx.conf:/etc/nginx/nginx.conf
       - ./.docker/nginx/demo.conf:/etc/nginx/sites-enabled/demo.conf
-    restart: always
+    restart: unless-stopped
     depends_on:
       - php
     networks:
@@ -26,7 +26,7 @@ services:
   db:
     image: mysql:8
     command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-    restart: always
+    restart: unless-stopped
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_PASSWORD}
       MYSQL_DATABASE: ${MYSQL_DATABASE}
@@ -40,7 +40,7 @@ services:
 
   php:
     build: .docker/php
-    restart: always
+    restart: unless-stopped
     environment:
       MYSQL_HOST: db
       MYSQL_USER: ${MYSQL_USER}