Add postgresql & improve composer

Author: andypost

.env.default

@@ -18,11 +18,14 @@ IMAGE_REDIS=redis:5-alpine
 IMAGE_DRIVER=zenika/alpine-chrome
 CLEAR_FRONT_PACKAGES=no
 ADD_PHP_EXT=
+#ADD_PHP_EXT=php7-pdo_pgsql postgresql-client postgresql-contrib  gnu-libiconv wkhtmltopdf
+COMPOSER_HOME_CACHE=.cache/composer
 MAIN_DOMAIN_NAME=docker.localhost
 DB_URL=sqlite:./../.cache/d8.sqlite
 # 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_URL=pgsql://d9:d9root@postgresql/d9
 # Include path to this folder to your .gitignore if you override it
 DB_DATA_DIR=../.cache
 #DB_DATA_DIR=/dev/shm

Makefile

@@ -24,9 +24,13 @@ CGID ?= $(LOCAL_GID)
 # Define network name.
 COMPOSE_NET_NAME := $(COMPOSE_PROJECT_NAME)_front
 
-# Determine mysql data directory if defined
-ifeq ($(shell docker-compose config --services | grep mysql),mysql)
-	MYSQL_DIR=$(shell cd docker && realpath $(DB_DATA_DIR))/$(COMPOSE_PROJECT_NAME)_mysql
+SDC_SERVICES=$(shell docker-compose config --services)
+# Determine database data directory if defined
+ifeq ($(findstring mysql,$(SDC_SERVICES)),mysql)
+	DB_MOUNT_DIR=$(shell cd docker && realpath $(DB_DATA_DIR))/$(COMPOSE_PROJECT_NAME)_mysql
+endif
+ifeq ($(findstring postgresql,$(SDC_SERVICES)),postgresql)
+	DB_MOUNT_DIR=$(shell cd docker && realpath $(DB_DATA_DIR))/$(COMPOSE_PROJECT_NAME)_pgsql
 endif
 
 # Define current directory only once
@@ -59,22 +63,26 @@ ifeq ($(strip $(COMPOSE_PROJECT_NAME)),projectname)
 	$(info Please review your project settings and run `make all` again.)
 	exit 1
 endif
-ifdef MYSQL_DIR
-	mkdir -p $(MYSQL_DIR) && chmod 777 $(MYSQL_DIR)
+ifdef DB_MOUNT_DIR
+	$(shell [ ! -d $(DB_MOUNT_DIR) ] && mkdir -p $(DB_MOUNT_DIR) && chmod 777 $(DB_MOUNT_DIR))
 endif
 	make -s down
 	@echo "Updating containers..."
 	docker-compose pull
 	@echo "Build and run containers..."
+	mkdir -p $(COMPOSER_HOME_CACHE)
 	docker-compose up -d --remove-orphans
 	$(call php-0, apk add --no-cache graphicsmagick $(ADD_PHP_EXT))
+	$(call php-0, sh -c '[ ! -z "$$COMPOSER_HOME" -a -d $$COMPOSER_HOME  ] && chown -R $(CUID):$(CGID) $$COMPOSER_HOME')
 	$(call php-0, kill -USR2 1)
 	$(call php, composer global require -o --update-no-dev --no-suggest "hirak/prestissimo:^0.3")
 
 ## Install backend dependencies
 back:
 	docker-compose up -d --remove-orphans php # PHP container is required for composer
-ifeq ($(INSTALL_DEV_DEPENDENCIES), TRUE)
+	$(call php-0, apk add --no-cache $(ADD_PHP_EXT))
+	$(call php-0, kill -USR2 1)
+ifdef INSTALL_DEV_DEPENDENCIES
 	@echo "INSTALL_DEV_DEPENDENCIES=$(INSTALL_DEV_DEPENDENCIES)"
 	@echo "Installing composer dependencies, including dev ones"
 	$(call php, composer install --prefer-dist -o)
@@ -142,9 +150,13 @@ clean: info
 	make -s down
 	$(eval SCAFFOLD = $(shell docker run --rm -v $(CURDIR):/mnt -w /mnt --user $(CUID):$(CGID) $(IMAGE_PHP) composer run-script list-scaffold-files | grep -P '^(?!>)'))
 	@docker run --rm --user 0:0 -v $(CURDIR):/mnt -w /mnt -e RMLIST="$(addprefix web/,$(SCAFFOLD)) $(DIRS)" $(IMAGE_PHP) sh -c 'for i in $$RMLIST; do rm -fr $$i && echo "Removed $$i"; done'
-ifdef MYSQL_DIR
-	@echo "Removing mysql data from $(MYSQL_DIR) ..."
-	docker run --rm --user 0:0 -v $(shell dirname $(MYSQL_DIR)):/mnt $(IMAGE_PHP) sh -c "rm -fr /mnt/`basename $(MYSQL_DIR)`"
+ifdef DB_MOUNT_DIR
+	@echo "Clean-up database data from $(DB_MOUNT_DIR) ..."
+	docker run --rm --user 0:0 -v $(shell dirname $(DB_MOUNT_DIR)):/mnt $(IMAGE_PHP) sh -c "rm -fr /mnt/`basename $(DB_MOUNT_DIR)`"
+endif
+ifdef COMPOSER_HOME_CACHE
+	@echo "Clean-up composer cache from $(COMPOSER_HOME_CACHE) ..."
+	docker run --rm --user 0:0 -v $(shell dirname $(abspath $(COMPOSER_HOME_CACHE))):/mnt $(IMAGE_PHP) sh -c "rm -fr /mnt/`basename $(COMPOSER_HOME_CACHE)`"
 endif
 ifeq ($(CLEAR_FRONT_PACKAGES), yes)
 	make clear-front

docker/docker-compose.override.yml.default

@@ -6,10 +6,13 @@ services:
   php:
     environment:
       COMPOSER_MEMORY_LIMIT: "-1"
+      COMPOSER_HOME: /home/www-data/.composer
     volumes:
       - "./90-mail.ini:/etc/php7/conf.d/90-mail.ini:z"
+      - "${COMPOSER_HOME_CACHE}:/home/www-data/.composer:z"
 #    depends_on:
 #      - mysql
+#      - postgresql
 # Uncomment next line if you need PHP XDebug.
 #    command: php-fpm7 -F -d zend_extension=xdebug.so
 
@@ -35,6 +38,20 @@ services:
 #      MYSQL_ROOT_PASSWORD: d8root
 #    restart: always
 #    networks:
+#      - front
+
+#  postgresql:
+#    image: postgres:12.2-alpine
+#    container_name: "${COMPOSE_PROJECT_NAME}_pgsql"
+#    volumes:
+#      - ${DB_DATA_DIR}/${COMPOSE_PROJECT_NAME}_pgsql:/var/lib/postgresql/data:Z
+#    environment:
+#      POSTGRES_DB: d9
+#      POSTGRES_USER: d9
+#      POSTGRES_PASSWORD: d9root
+#      PGDATA: /var/lib/postgresql/data
+#    restart: always
+#    networks:
 #      - front
 
   mailhog: