Docker: fix user chmod

Author: jgauthi

.docker/php/Dockerfile

@@ -22,8 +22,6 @@ COPY php-fpm-pool.conf /usr/local/etc/php/php-fpm.conf
 RUN curl -sSk https://getcomposer.org/installer | php -- --disable-tls && \
 	mv composer.phar /usr/local/bin/composer
 
-RUN usermod -u 1000 www-data
-
 # Purge
 RUN rm -rf /var/lib/apt/lists/* \
     && apt-get purge --auto-remove -y g++ \

.env.dist

@@ -29,6 +29,8 @@ APP_SECRET=1c033cf04c8c84f016ffa88768ee165a
 
 ###> 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
 MYSQL_DATABASE=demo
 MYSQL_USER=local
 MYSQL_PASSWORD=local

Makefile

@@ -12,6 +12,7 @@ CONSOLE=bin/console
 PHPCSFIXER?=$(EXEC) php -d memory_limit=1024m vendor/bin/php-cs-fixer
 DOCKER_COMPOSE_OVERRIDE ?= dev
 ENV ?= dev
+
 help:
 	@grep -E '(^[a-zA-Z_-]+:.*?##.*$$)|(^##)' $(firstword $(MAKEFILE_LIST)) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[32m%-30s\033[0m %s\n", $$1, $$2}' | sed -e 's/\[32m##/[33m/'
 
@@ -32,10 +33,18 @@ restart: stop up-ci  ## Restart docker containers
 
 install: docker-compose.override.yml build up composer-install perm  ## Create and start docker containers
 
+install-demo:
+	@$(EXEC_ROOT) chmod 775 /var/www
+	@$(EXEC_ROOT) chown www-data:www-data /var/www
+	$(call composer,create-project symfony/symfony-demo demo)
+	@$(EXEC_ROOT) bash -c "mv demo/* . && rm -rf demo/"
+	# todo: change doctrine config (use mysql instead sqlite)
+	make clear-cache
+
 status:  ## Docker container status
 	@$(DOCKER_COMPOSE) ps
 
-uninstall: stop  ## Remove docker containers
+uninstall: stop clear  ## Remove docker containers
 	@$(DOCKER_COMPOSE) rm -vf
 
 reset: uninstall install  ## Remove and re-create docker containers
@@ -83,20 +92,20 @@ db-diff:  ## Generate a migration by comparing your current database to your map
 	@$(EXEC) $(CONSOLE) doctrine:migration:diff
 
 db-migrate:  ## Migrate database schema to the latest available version
-	@$(EXEC) $(CONSOLE) doctrine:migration:migrate -n
+	@$(EXEC) $(CONSOLE) doctrine:migration:migrate -n --env=$(ENV)
 
 db-rollback:  ## Rollback the latest executed migration
-	@$(EXEC) $(CONSOLE) doctrine:migration:migrate prev -n
+	@$(EXEC) $(CONSOLE) doctrine:migration:migrate prev -n --env=$(ENV)
 
 db-validate:  ## Check the ORM mapping
 	@$(EXEC) $(CONSOLE) doctrine:schema:validate
 
 db-install:  ## Install database, you can add 'db-fixtures' argument for apply fixtures after install
 	@$(EXEC) $(CONSOLE) doctrine:database:create --if-not-exists
-	@$(EXEC) $(CONSOLE) doctrine:migrations:migrate -n
+	@$(EXEC) $(CONSOLE) doctrine:migrations:migrate -n --env=$(ENV)
 
 db-fixtures:  ## Apply doctrine fixtures
-	@$(EXEC) $(CONSOLE) doctrine:fixtures:load -n
+	@$(EXEC) $(CONSOLE) doctrine:fixtures:load -n --env=$(ENV)
 
 # ##
 # ## Assets
@@ -157,9 +166,9 @@ up-ci:
 	@$(DOCKER_COMPOSE) up -d --remove-orphans
 
 perm: ## Set folder permissions
-	@$(EXEC_ROOT) chmod -R 775 var public/uploads
-	@$(EXEC_ROOT) chgrp -R www-data var public/uploads
-	@$(EXEC_ROOT) chmod +x bin/* vendor/bin/*
+	@$(EXEC_ROOT) chmod -R 775 var
+	@$(EXEC_ROOT) chgrp -R www-data var
+	@$(EXEC_ROOT) bash -c "chmod +x bin/* vendor/bin/*"
 
 #docker-compose.override.yml:
 #ifneq ($(wildcard docker-compose.override.yml),docker-compose.override.yml)

docker-compose.yml

@@ -16,6 +16,7 @@ services:
     restart: always
     depends_on:
       - php
+    user: "${VOLUME_USER_ID:-www-data}:www-data"
     networks:
       sfdemo:
         aliases:
@@ -44,6 +45,7 @@ services:
       - ${COMPOSER_HOME:-/tmp/composer}:/home/www-data/.composer # Share composer cache
     depends_on:
       - db
+    user: "${VOLUME_USER_ID:-www-data}:www-data"
     networks:
       - sfdemo