Merge branch 'master' into master

.env.default

@@ -4,5 +4,5 @@ PROFILE_NAME=sdd
 THEME_NAME=projectname_theme
 SITE_NAME=Site name
 COMPOSER_REQUIRE=solarium/solarium:3.6.*
-PHP_IMAGE=php:7-fpm
 PROJECT_INSTALL=
+PHP_VERSION=7.1

Makefile

@@ -8,14 +8,18 @@ COMPOSE_ARGS="-d"
 $(shell cp -n .env.default .env)
 $(shell cp -n ./src/docker/docker-compose.override.yml.default ./src/docker/docker-compose.override.yml)
 else
-COMPOSE_ARGS=""
 WINDOWS=0
+COMPOSE_ARGS=""
 $(shell cp -n \.env.default \.env)
 $(shell cp -n \.\/src\/docker\/docker-compose\.override\.yml\.default \.\/src\/docker\/docker-compose\.override\.yml)
 endif
 
 include .env
 
+# Setup PHP Variables based on package version
+PHP_IMAGE=php:$(shell printf '%s' "$(PHP_VERSION)" | sed -e 's/\.//')-fpm
+export PHP_IMAGE
+
 all: | include net build install info
 
 include:
@@ -91,8 +95,8 @@ endif
 
 front:
 	@echo "Building front tasks..."
-	docker run --rm -v $(shell pwd)/src/themes/$(THEME_NAME):/work skilldlabs/frontend:zen; \
-	docker-compose exec $(ARGS) php rm -rf themes/custom/$(THEME_NAME)/node_modules
+	docker run -t --rm -v $(shell pwd)/src/themes/$(THEME_NAME):/work skilldlabs/frontend:zen; \
+	docker-compose exec php rm -rf themes/custom/$(THEME_NAME)/node_modules
 	make -s chown
 
 iprange:
@@ -113,6 +117,10 @@ devel:
 	-docker-compose exec $(ARGS) php drush en devel devel_generate kint -y
 	-docker-compose exec $(ARGS) php drush pm-uninstall dynamic_page_cache internal_page_cache -y
 
+	@echo "Disabling js/css aggregation"
+	docker-compose exec php drush -y config-set system.performance css.preprocess 0
+	docker-compose exec php drush -y config-set system.performance js.preprocess 0
+
 	@echo "Setting up Twig in debug mode ..."
 	docker-compose exec $(ARGS) php sed -i "s:debug\: false:debug\: true:g" sites/default/services.yml
 	docker-compose exec $(ARGS) php sed -i "s:auto_reload\: null:auto_reload\: false:g" sites/default/services.yml

src/docker/docker-compose.override.yml.default

@@ -5,7 +5,7 @@ services:
 # Override base service.
   php:
     volumes:
-      - ./90-mail.ini:/etc/php7/conf.d/90-mail.ini:z
+      - "./90-mail.ini:/etc/php${PHP_VERSION}/conf.d/90-mail.ini:z"
       - ../../config/sync:/var/www/html/sync:z
 # Uncomment next line if you need PHP XDebug.
 #    command: php-fpm7 -F -d zend_extension=xdebug.so