Backport fixes to ustream

Author: andypost

Makefile

@@ -72,15 +72,18 @@ endif
 	@echo "Build and run containers..."
 	mkdir -p $(COMPOSER_HOME_CACHE)
 	docker-compose up -d --remove-orphans
-	$(call php-0, apk add --no-cache graphicsmagick $(ADD_PHP_EXT))
+	$(call php-0, apk add --no-cache graphicsmagick tzdata $(ADD_PHP_EXT))
 	$(call php-0, sh -c '[ ! -z "$$COMPOSER_HOME" -a -d $$COMPOSER_HOME  ] && chown -R $(CUID):$(CGID) $$COMPOSER_HOME')
+	# Set up timezone
+	$(call php-0, cp /usr/share/zoneinfo/Europe/Paris /etc/localtime)
 	$(call php-0, kill -USR2 1)
 	$(call php, composer global require -o --update-no-dev --no-suggest "hirak/prestissimo:^0.3")
 
 ## Install backend dependencies
 back:
 	docker-compose up -d --remove-orphans --no-deps php # PHP container is required for composer
 	$(call php-0, apk add --no-cache $(ADD_PHP_EXT))
+	$(call php-0, sh -c '[ ! -z "$$COMPOSER_HOME" -a -d $$COMPOSER_HOME  ] && chown -R $(CUID):$(CGID) $$COMPOSER_HOME')
 	$(call php-0, kill -USR2 1)
 ifdef INSTALL_DEV_DEPENDENCIES
 	@echo "INSTALL_DEV_DEPENDENCIES=$(INSTALL_DEV_DEPENDENCIES)"

docker/docker-compose.override.yml.default

@@ -9,7 +9,7 @@ services:
       COMPOSER_HOME: /home/www-data/.composer
     volumes:
       - "./90-mail.ini:/etc/php7/conf.d/90-mail.ini:z"
-      - "${COMPOSER_HOME_CACHE}:/home/www-data/.composer:z"
+      - "../${COMPOSER_HOME_CACHE}:/home/www-data/.composer:z"
 #    depends_on:
 #      - mysql
 #      - postgresql

docker/docker-compose.yml

@@ -47,7 +47,7 @@ services:
 #  redis:
 #    image: ${IMAGE_REDIS}
 #    container_name: "${COMPOSE_PROJECT_NAME}_redis"
-#    command: redis-server --requirepass ${REDIS_PASSWD}
+#    command: redis-server --maxmemory-policy allkeys-lru --requirepass ${REDIS_PASSWD}
 #    restart: always
 #    networks:
 #      - front

scripts/makefile/tests.mk

@@ -6,7 +6,7 @@ phpcsexec = docker run --rm \
 	skilldlabs/docker-phpcs-drupal ${1} -s --colors \
 	--standard=Drupal,DrupalPractice \
 	--extensions=php,module,inc,install,profile,theme,yml,txt,md,js \
-	--ignore=*.css,libraries/*,dist/*,README.md,README.txt,node_modules/*,work/themes/**.js,work/themes/**.md \
+	--ignore=*.css,libraries/*,dist/*,styleguide/*,README.md,README.txt,node_modules/*,work/themes/**.js,work/themes/**.md \
 	.
 
 ## Validate codebase with phpcs sniffers to make sure it conforms https://www.drupal.org/docs/develop/standards