Skip to content

Commit

Permalink
Fix timezone usage and backport changes
Browse files Browse the repository at this point in the history
  • Loading branch information
andypost committed Oct 9, 2020
1 parent b0d2ac4 commit b31d414
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,19 @@ endif
docker-compose pull
@echo "Build and run containers..."
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))
# 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 php # PHP container is required for composer
ifneq ($(strip $(ADD_PHP_EXT)),)
# Install additional php extensions as this goal used in CI (todo stop doing it)
$(call php-0, apk add --no-cache $(ADD_PHP_EXT))
endif
ifeq ($(INSTALL_DEV_DEPENDENCIES), TRUE)
@echo "INSTALL_DEV_DEPENDENCIES=$(INSTALL_DEV_DEPENDENCIES)"
@echo "Installing composer dependencies, including dev ones"
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/makefile/tests.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b31d414

Please sign in to comment.