Upgrade nginx and php, fix .env

Author: andypost

.env.default

@@ -10,8 +10,8 @@ ADMIN_MAIL=admin@example.com
 ADMIN_PW=admin
 TESTER_PW=tester
 PROJECT_INSTALL=
-IMAGE_PHP=skilldlabs/php:73-fpm
-IMAGE_NGINX=skilldlabs/nginx:1.16
+IMAGE_PHP=skilldlabs/php:74-fpm
+IMAGE_NGINX=skilldlabs/nginx:1.18
 IMAGE_FRONT=node:lts-alpine
 IMAGE_SOLR=solr:8-slim
 IMAGE_REDIS=redis:5-alpine
@@ -20,9 +20,12 @@ CLEAR_FRONT_PACKAGES=no
 ADD_PHP_EXT=
 MAIN_DOMAIN_NAME=docker.localhost
 DB_URL=sqlite:./../.cache/d8.sqlite
-#DB_URL=sqlite:///dev/shm/d8.sqlite # Faster but data will be lost on php container recreation
+# Faster but data will be lost on php container recreation
+#DB_URL=sqlite:///dev/shm/d8.sqlite
 #DB_URL=mysql://d8:d8@mysql/d8
-DB_DATA_DIR=../.cache # Include path to this folder to your .gitignore if you override it
+# Include path to this folder to your .gitignore if you override it
+DB_DATA_DIR=../.cache
+#DB_DATA_DIR=/dev/shm
 # We're connecting through TCP. Use "redis" as host, and "6379" as port.
 REDIS_HOST=redis
 REDIS_PORT=6379

Makefile

@@ -27,7 +27,7 @@ COMPOSE_NET_NAME := $(COMPOSE_PROJECT_NAME)_front
 # Execute php container as regular user
 php = docker-compose exec -T --user $(CUID):$(CGID) php ${1}
 # Execute php container as root user
-php-0 = docker-compose exec -T php ${1}
+php-0 = docker-compose exec -T --user 0:0 php ${1}
 
 ## Full site install from the scratch
 all: | provision back front si localize hooksymlink info