Skip to content

Commit 4f62d4f

Browse files
committed
Fix timezone usage and backport changes
1 parent b0d2ac4 commit 4f62d4f

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ endif
6767
docker-compose pull
6868
@echo "Build and run containers..."
6969
docker-compose up -d --remove-orphans
70-
$(call php-0, apk add --no-cache graphicsmagick $(ADD_PHP_EXT))
70+
$(call php-0, apk add --no-cache graphicsmagick tzdata $(ADD_PHP_EXT))
71+
# Set up timezone
72+
$(call php-0, cp /usr/share/zoneinfo/Europe/Paris /etc/localtime)
7173
$(call php-0, kill -USR2 1)
7274
$(call php, composer global require -o --update-no-dev --no-suggest "hirak/prestissimo:^0.3")
7375

docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ services:
4747
# redis:
4848
# image: ${IMAGE_REDIS}
4949
# container_name: "${COMPOSE_PROJECT_NAME}_redis"
50-
# command: redis-server --requirepass ${REDIS_PASSWD}
50+
# command: redis-server --maxmemory-policy allkeys-lru --requirepass ${REDIS_PASSWD}
5151
# restart: always
5252
# networks:
5353
# - front

scripts/makefile/tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ phpcsexec = docker run --rm \
66
skilldlabs/docker-phpcs-drupal ${1} -s --colors \
77
--standard=Drupal,DrupalPractice \
88
--extensions=php,module,inc,install,profile,theme,yml,txt,md,js \
9-
--ignore=*.css,libraries/*,dist/*,README.md,README.txt,node_modules/*,work/themes/**.js,work/themes/**.md \
9+
--ignore=*.css,libraries/*,dist/*,styleguide/*,README.md,README.txt,node_modules/*,work/themes/**.js,work/themes/**.md \
1010
.
1111

1212
## Validate codebase with phpcs sniffers to make sure it conforms https://www.drupal.org/docs/develop/standards

0 commit comments

Comments
 (0)