php container: change structure to split project by folder, fix #4

Author: jgauthi

.docker/nginx/demo.conf renamed to .docker/nginx/sites/demo.conf

@@ -2,7 +2,7 @@ server {
     listen 80 default_server;
     listen [::]:80 default_server;
     server_name demo.localhost.tv;
-    root /var/www/public;
+    root /var/www/demo/public;
 
     location / {
         try_files $uri @rewriteapp;
@@ -21,6 +21,9 @@ server {
         fastcgi_param HTTPS off;
     }
 
+    # You can write your logs in symfony log folder
+    # error_log /var/www/demo/var/log/nginx-error.log;
+    # access_log /var/www/demo/var/log/nginx-access.log;
     error_log /var/log/nginx/demo_error.log;
     access_log /var/log/nginx/demo_access.log;
 }

.docker/php/Dockerfile

@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends vim curl locale
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
 RUN install-php-extensions @composer \
     apcu opcache intl \
-    gd imagick \
+    gd \
     pdo_mysql \
     mbstring \
     sodium \

Makefile

@@ -7,9 +7,11 @@ endif
 # Init var
 user := $(shell id -u)
 group := $(shell id www-data -g)
+PROJECT_NAME=demo
+PROJECT_DIR=/var/www/$(PROJECT_NAME)
 DOCKER_COMPOSE := USER_ID=$(user) GROUP_ID=$(group) docker-compose
-EXEC?=$(DOCKER_COMPOSE) exec php
-EXEC_ROOT?=$(DOCKER_COMPOSE) exec -u root php
+EXEC?=$(DOCKER_COMPOSE) exec --workdir $(PROJECT_DIR) php
+EXEC_ROOT?=$(DOCKER_COMPOSE) exec --workdir $(PROJECT_DIR) -u root php
 CONSOLE=bin/console
 PHPCSFIXER?=$(EXEC) php -d memory_limit=1024m vendor/bin/php-cs-fixer
 DOCKER_COMPOSE_OVERRIDE ?= dev
@@ -30,17 +32,21 @@ up: docker-compose.override.yml up-ci  ## Start project with docker-compose + De
 stop:  ## Stop docker containers
 	@$(DOCKER_COMPOSE) stop
 
+refresh: ## Remove and re-create docker containers (WITHOUT delete all data)
+	@$(DOCKER_COMPOSE) down
+	@make up-ci
+
 restart: stop up-ci  ## Restart docker containers
 
 install: docker-compose.override.yml build up ## Create and start docker containers
 
 install-demo:
-	@$(EXEC_ROOT) chmod 775 /var/www
-	@$(EXEC_ROOT) chown www-data:www-data /var/www
+	@$(EXEC_ROOT) chmod -R 775 /var/www
+	@$(EXEC_ROOT) chown -R www-data:www-data /var/www
 	@rm -rf project/* project/.env
-	$(call composer,create-project symfony/symfony-demo demo)
+	$(call composer,create-project symfony/symfony-demo install_project,/var/www)
 	@cp .docker/php/symfony-demo.env project/.env
-	@$(EXEC_ROOT) bash -c "mv demo/* . && rm -rf demo/ data/"
+	@$(EXEC_ROOT) bash -c "cd /var/www && mv install_project/* $(PROJECT_NAME)/ && rm -rf install_project/ data/"
 	@make restart perm db-create-migration db-install clear-cache
 
 install-prod:
@@ -77,13 +83,13 @@ clean: clear  ## Clear and remove dependencies
 ## Developpment
 ##---------------------------------------------------------------------------
 define composer
-	@$(EXEC) php -d memory_limit=1500M /usr/local/bin/composer $(1) -n
+	@$(EXEC) php -d memory_limit=1500M /usr/local/bin/composer $(1) -n --working-dir=$(or $(2),$(PROJECT_DIR))
 endef
 
 composer-install:  ## Composer installation
 	$(call composer,install)
 
-composer:  ## Composer command. You can specified package, example: `make composer CMD="update twig/twig"`
+composer:  ## Composer command. You can specified package, example: `make composer CMD="update twig/twig"`, you can set another project folder with the argument PROJECT_NAME="folder name in /var/www --OR-- /folder/full/path/location"
 	$(call composer,$(CMD))
 
 shell:  ## Run app container in interactive mode

docker-compose.yml

@@ -12,9 +12,9 @@ services:
       - 80
       - 443
     volumes:
-      - ./project:/var/www
+      - ./project:/var/www/demo
       - ./.docker/nginx/nginx.conf:/etc/nginx/nginx.conf
-      - ./.docker/nginx/demo.conf:/etc/nginx/sites-enabled/demo.conf
+      - ./.docker/nginx/sites:/etc/nginx/sites-enabled
     restart: unless-stopped
     depends_on:
       - php
@@ -48,7 +48,7 @@ services:
       MYSQL_PORT: ${MYSQL_PORT}
       MYSQL_DATABASE: ${MYSQL_DATABASE}
     volumes:
-      - ./project:/var/www
+      - ./project:/var/www/demo
       - ${COMPOSER_HOME:-/tmp/composer}:/home/www-data/.composer # Share composer cache
     depends_on:
       - db

readme.md

@@ -1,10 +1,10 @@
 # Docker Nginx + PHP + Mysql + Dev Tools
-A Docker image based on Ubuntu, serving PHP 7.4 FPM running as Nginx Module. Useful for Web developers in need for a fixed PHP version. In addition, the `error_reporting` setting in php.ini is configurable per container via environment variable.
+A Docker image based on Ubuntu, serving PHP 8.1 FPM running as Nginx Module. Useful for Web developers in need for a fixed PHP version. In addition, the `error_reporting` setting in php.ini is configurable per container via environment variable.
 
 ## Prerequisite
 
 * Docker v18+ / Docker-compose v1.23+ / [Manage Docker as a non-root user](https://docs.docker.com/install/linux/linux-postinstall/)
-* Make command: Under linux `sudo apt install build-essential` or for [windows users](https://stackoverflow.com/questions/32127524/how-to-install-and-use-make-in-windows/54086635)
+* Make command: Under linux `sudo apt install build-essential` or for [Windows users](https://stackoverflow.com/questions/32127524/how-to-install-and-use-make-in-windows/54086635)
 * Git