Backport clean-ups

Author: andypost

.env.default

@@ -17,7 +17,7 @@ IMAGE_SOLR=solr:8-slim
 IMAGE_REDIS=redis:5-alpine
 IMAGE_DRIVER=zenika/alpine-chrome
 CLEAR_FRONT_PACKAGES=no
-ADD_PHP_EXT=
+ADD_PHP_EXT=graphicsmagick
 #ADD_PHP_EXT=php7-pdo_pgsql postgresql-client postgresql-contrib  gnu-libiconv wkhtmltopdf
 MAIN_DOMAIN_NAME=docker.localhost
 DB_URL=sqlite:./../.cache/d8.sqlite

.gitlab-ci.yml

@@ -180,7 +180,7 @@ prepare:front:
     - echo "CI_PROJECT_NAME=${CI_PROJECT_NAME}"
     - echo "REVIEW_DOMAIN=${REVIEW_DOMAIN}"
     - mkdir -p ${BUILD_DIR}
-    - rsync -ah --exclude=.git --delete ./ ${BUILD_DIR}
+    - rsync -ah --exclude=.git --exclude=.cache --delete ./ ${BUILD_DIR}
     - cd ${BUILD_DIR}
     - echo "COMPOSE_PROJECT_NAME=${CI_PROJECT_NAME}-review-${CI_COMMIT_REF_SLUG}" >> .env.default
     - echo "MAIN_DOMAIN_NAME=${CI_ENVIRONMENT_SLUG}-${CI_PROJECT_PATH_SLUG}.${REVIEW_DOMAIN}" >> .env.default

Makefile

@@ -71,7 +71,7 @@ endif
 	docker-compose pull
 	@echo "Build and run containers..."
 	docker-compose up -d --remove-orphans
-	$(call php-0, apk add --no-cache graphicsmagick tzdata $(ADD_PHP_EXT))
+	$(call php-0, apk add --no-cache tzdata $(ADD_PHP_EXT))
 	# Set up timezone
 	$(call php-0, cp /usr/share/zoneinfo/Europe/Paris /etc/localtime)
 	$(call php-0, kill -USR2 1)

docker/docker-compose.override.yml.default

@@ -38,7 +38,7 @@ services:
 #      - front
 
 #  adminer:
-#    image: dockette/adminer:mysql-php7
+#    image: adminer:standalone
 #    container_name: "${COMPOSE_PROJECT_NAME}_adminer"
 #    links:
 #      - mysql:mysql

scripts/makefile/tests.mk

@@ -167,8 +167,8 @@ browser_driver:
 
 ## Stop browser driver
 browser_driver_stop:
+	@echo 'Stopping browser driver...'
 	if [ ! -z `docker ps -f 'name=$(COMPOSE_PROJECT_NAME)_chrome' --format '{{.Names}}'` ]; then \
-		echo 'Stopping browser driver.'; \
 		docker stop $(COMPOSE_PROJECT_NAME)_chrome; \
 	fi