File tree Expand file tree Collapse file tree 4 files changed +6
-5
lines changed Expand file tree Collapse file tree 4 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ IMAGE_SOLR=solr:8-slim
1717IMAGE_REDIS=redis:5-alpine
1818IMAGE_DRIVER=zenika/alpine-chrome
1919CLEAR_FRONT_PACKAGES=no
20- ADD_PHP_EXT=
20+ ADD_PHP_EXT=graphicsmagick
2121#ADD_PHP_EXT=php7-pdo_pgsql postgresql-client postgresql-contrib gnu-libiconv wkhtmltopdf
2222MAIN_DOMAIN_NAME=docker.localhost
2323DB_URL=sqlite:./../.cache/d8.sqlite
Original file line number Diff line number Diff line change @@ -179,7 +179,7 @@ prepare:front:
179179 - echo "CI_PROJECT_NAME=${CI_PROJECT_NAME}"
180180 - echo "REVIEW_DOMAIN=${REVIEW_DOMAIN}"
181181 - mkdir -p ${BUILD_DIR}
182- - rsync -ah --exclude=.git --delete ./ ${BUILD_DIR}
182+ - rsync -ah --exclude=.git --exclude=.cache -- delete ./ ${BUILD_DIR}
183183 - cd ${BUILD_DIR}
184184 - echo "COMPOSE_PROJECT_NAME=${CI_PROJECT_NAME}-review-${CI_COMMIT_REF_SLUG}" >> .env.default
185185 - echo "MAIN_DOMAIN_NAME=${CI_ENVIRONMENT_SLUG}-${CI_PROJECT_PATH_SLUG}.${REVIEW_DOMAIN}" >> .env.default
Original file line number Diff line number Diff line change 7171 docker-compose pull
7272 @echo "Build and run containers..."
7373 docker-compose up -d --remove-orphans
74- $(call php-0, apk add --no-cache graphicsmagick tzdata $(ADD_PHP_EXT))
74+ $(call php-0, apk add --no-cache tzdata $(ADD_PHP_EXT))
7575 # Set up timezone
7676 $(call php-0, cp /usr/share/zoneinfo/Europe/Paris /etc/localtime)
7777 $(call php-0, kill -USR2 1)
@@ -145,7 +145,7 @@ down:
145145 @if [ ! -z " $( shell docker ps -f ' name=$(COMPOSE_PROJECT_NAME)_chrome' --format ' {{.Names}}' ) " ]; then \
146146 echo ' Stoping browser driver.' && make -s browser_driver_stop; fi
147147
148- DIRS = web/core web/libraries web/modules/contrib web/profiles/contrib web/sites web/themes/contrib vendor
148+ DIRS = web/core web/libraries web/modules/contrib web/profiles/contrib web/sites web/themes/contrib vendor .cache/composer/cache
149149
150150# # Totally remove project build folder, docker containers and network
151151clean : info
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ services:
66 php:
77 environment:
88 COMPOSER_MEMORY_LIMIT: "-1"
9+ COMPOSER_CACHE_DIR: /var/www/html/.cache/composer/cache
910# BLACKFIRE_CLIENT_ID: x
1011# BLACKFIRE_CLIENT_TOKEN: x
1112# NEW_RELIC_LICENSE_KEY: x
@@ -38,7 +39,7 @@ services:
3839# - front
3940
4041# adminer:
41- # image: dockette/ adminer:mysql-php7
42+ # image: adminer:standalone
4243# container_name: "${COMPOSE_PROJECT_NAME}_adminer"
4344# links:
4445# - mysql:mysql
You can’t perform that action at this time.
0 commit comments