From 6d1868a6e00286ff991235066f1f180cab88a0fa Mon Sep 17 00:00:00 2001 From: Jonathan Jogenfors Date: Tue, 3 Oct 2023 03:50:27 +0200 Subject: [PATCH] feat: server containers use host timezone (#4313) --- docker/docker-compose.dev.yml | 4 ++++ docker/docker-compose.prod.yml | 6 +++++- docker/docker-compose.yml | 8 ++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index a77253cee9..366052d1f7 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -13,6 +13,8 @@ services: - ../server:/usr/src/app - ${UPLOAD_LOCATION}:/usr/src/app/upload - /usr/src/app/node_modules + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro ports: - 3001:3001 - 9230:9230 @@ -59,6 +61,8 @@ services: - ../server:/usr/src/app - ${UPLOAD_LOCATION}:/usr/src/app/upload - /usr/src/app/node_modules + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro env_file: - .env ports: diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml index 0374def08f..f0ed73a364 100644 --- a/docker/docker-compose.prod.yml +++ b/docker/docker-compose.prod.yml @@ -10,6 +10,8 @@ services: command: ["./start-server.sh"] volumes: - ${UPLOAD_LOCATION}:/usr/src/app/upload + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro env_file: - .env depends_on: @@ -29,7 +31,7 @@ services: env_file: - .env restart: always - + immich-microservices: container_name: immich_microservices image: immich-microservices:latest @@ -42,6 +44,8 @@ services: command: ["./start-microservices.sh"] volumes: - ${UPLOAD_LOCATION}:/usr/src/app/upload + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro env_file: - .env depends_on: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d967639723..f789008513 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -4,9 +4,11 @@ services: immich-server: container_name: immich_server image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release} - command: [ "start.sh", "immich" ] + command: ["start.sh", "immich"] volumes: - ${UPLOAD_LOCATION}:/usr/src/app/upload + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro env_file: - .env depends_on: @@ -21,9 +23,11 @@ services: # extends: # file: hwaccel.yml # service: hwaccel - command: [ "start.sh", "microservices" ] + command: ["start.sh", "microservices"] volumes: - ${UPLOAD_LOCATION}:/usr/src/app/upload + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro env_file: - .env depends_on: