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
17
17
IMAGE_REDIS=redis:5-alpine
18
18
IMAGE_DRIVER=zenika/alpine-chrome
19
19
CLEAR_FRONT_PACKAGES=no
20
- ADD_PHP_EXT=
20
+ ADD_PHP_EXT=graphicsmagick
21
21
#ADD_PHP_EXT=php7-pdo_pgsql postgresql-client postgresql-contrib gnu-libiconv wkhtmltopdf
22
22
MAIN_DOMAIN_NAME=docker.localhost
23
23
DB_URL=sqlite:./../.cache/d8.sqlite
Original file line number Diff line number Diff line change @@ -179,7 +179,7 @@ prepare:front:
179
179
- echo "CI_PROJECT_NAME=${CI_PROJECT_NAME}"
180
180
- echo "REVIEW_DOMAIN=${REVIEW_DOMAIN}"
181
181
- mkdir -p ${BUILD_DIR}
182
- - rsync -ah --exclude=.git --delete ./ ${BUILD_DIR}
182
+ - rsync -ah --exclude=.git --exclude=.cache -- delete ./ ${BUILD_DIR}
183
183
- cd ${BUILD_DIR}
184
184
- echo "COMPOSE_PROJECT_NAME=${CI_PROJECT_NAME}-review-${CI_COMMIT_REF_SLUG}" >> .env.default
185
185
- 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 71
71
docker-compose pull
72
72
@echo "Build and run containers..."
73
73
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))
75
75
# Set up timezone
76
76
$(call php-0, cp /usr/share/zoneinfo/Europe/Paris /etc/localtime)
77
77
$(call php-0, kill -USR2 1)
@@ -145,7 +145,7 @@ down:
145
145
@if [ ! -z " $( shell docker ps -f ' name=$(COMPOSE_PROJECT_NAME)_chrome' --format ' {{.Names}}' ) " ]; then \
146
146
echo ' Stoping browser driver.' && make -s browser_driver_stop; fi
147
147
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
149
149
150
150
# # Totally remove project build folder, docker containers and network
151
151
clean : info
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ services:
6
6
php:
7
7
environment:
8
8
COMPOSER_MEMORY_LIMIT: "-1"
9
+ COMPOSER_CACHE_DIR: /var/www/html/.cache/composer/cache
9
10
# BLACKFIRE_CLIENT_ID: x
10
11
# BLACKFIRE_CLIENT_TOKEN: x
11
12
# NEW_RELIC_LICENSE_KEY: x
@@ -38,7 +39,7 @@ services:
38
39
# - front
39
40
40
41
# adminer:
41
- # image: dockette/ adminer:mysql-php7
42
+ # image: adminer:standalone
42
43
# container_name: "${COMPOSE_PROJECT_NAME}_adminer"
43
44
# links:
44
45
# - mysql:mysql
You can’t perform that action at this time.
0 commit comments