From f045ce1960782002b94c55e3f1cf70fdfb426080 Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Wed, 12 Aug 2020 18:06:08 +0300
Subject: [PATCH] Add local composer cache

---
 .env.default                               | 2 +-
 .gitlab-ci.yml                             | 2 +-
 Makefile                                   | 4 ++--
 docker/docker-compose.override.yml.default | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.env.default b/.env.default
index 85b484cd4..a316a8e96 100644
--- a/.env.default
+++ b/.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
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f98a1bc6..e99d52303 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -179,7 +179,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
diff --git a/Makefile b/Makefile
index 800e89bf7..a179ab9c9 100644
--- a/Makefile
+++ b/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)
@@ -145,7 +145,7 @@ down:
 	@if [ ! -z "$(shell docker ps -f 'name=$(COMPOSE_PROJECT_NAME)_chrome' --format '{{.Names}}')" ]; then \
 		echo 'Stoping browser driver.' && make -s browser_driver_stop; fi
 
-DIRS = web/core web/libraries web/modules/contrib web/profiles/contrib web/sites web/themes/contrib vendor
+DIRS = web/core web/libraries web/modules/contrib web/profiles/contrib web/sites web/themes/contrib vendor .cache/composer/cache
 
 ## Totally remove project build folder, docker containers and network
 clean: info
diff --git a/docker/docker-compose.override.yml.default b/docker/docker-compose.override.yml.default
index ac987eeb9..11ccb8fe4 100644
--- a/docker/docker-compose.override.yml.default
+++ b/docker/docker-compose.override.yml.default
@@ -6,6 +6,7 @@ services:
   php:
     environment:
       COMPOSER_MEMORY_LIMIT: "-1"
+      COMPOSER_CACHE_DIR: /var/www/html/.cache/composer/cache
 #      BLACKFIRE_CLIENT_ID: x
 #      BLACKFIRE_CLIENT_TOKEN: x
 #      NEW_RELIC_LICENSE_KEY: x
@@ -38,7 +39,7 @@ services:
 #      - front
 
 #  adminer:
-#    image: dockette/adminer:mysql-php7
+#    image: adminer:standalone
 #    container_name: "${COMPOSE_PROJECT_NAME}_adminer"
 #    links:
 #      - mysql:mysql