From e3292dd5627f95d59d130a8c1b9a62df317ae6bd Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Thu, 28 Oct 2021 16:01:45 +0300
Subject: [PATCH] Part 2: Docker: Try to fix "Failed export and unexpected
 container restart". Added timezone and localtime.

Thanks to akitzing, mfilser and xet7 !

Fixes #4089
---
 .devcontainer/docker-compose.yml     |  7 +++++--
 docker-compose.yml                   |  4 +---
 torodb-postgresql/docker-compose.yml | 13 ++++++++++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index af38558c0..adada5110 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -14,8 +14,8 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
-      - ./volumes/wekan-db:/data/db
-      - ./volumes/wekan-db-dump:/dump
+      - wekan-db:/data/db
+      - wekan-db-dump:/dump
 
   wekan-dev:
     container_name: wekan-dev-app
@@ -45,12 +45,15 @@ services:
       - ../i18n:/home/wekan/app/i18n
       - ../server:/home/wekan/app/server
       - ../public:/home/wekan/app/public
+      - wekan-tmp:/tmp
 
 volumes:
   wekan-dev-db:
     driver: local
   wekan-dev-db-dump:
     driver: local
+  wekan-tmp:
+    driver: local
 
 networks:
   wekan-dev-tier:
diff --git a/docker-compose.yml b/docker-compose.yml
index 2def5f901..10e066cea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -664,6 +664,7 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
+      - wekan-tmp:/tmp
 
 #---------------------------------------------------------------------------------
 # ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ====
@@ -721,9 +722,6 @@ volumes:
     driver: local
   wekan-tmp:
     driver: local
-  - /etc/localtime:/etc/localtime:ro
-  - /etc/timezone:/etc/timezone:ro
-  - ./volumes/wekan-tmp:/tmp
 
 networks:
   wekan-tier:
diff --git a/torodb-postgresql/docker-compose.yml b/torodb-postgresql/docker-compose.yml
index a4cd6ef93..f78686a3e 100644
--- a/torodb-postgresql/docker-compose.yml
+++ b/torodb-postgresql/docker-compose.yml
@@ -136,6 +136,12 @@ services:
             rs.initiate({_id:"rs1",members:[{_id:0,host:"mongodb:27017"}]});
         ' 1>/dev/null 2>&1 &
         mongod --replSet rs1
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+      - wekan-db:/data/db
+      - wekan-db-dump:/dump
+
   wekan:
     image: quay.io/wekan/wekan
     container_name: wekan-app
@@ -604,6 +610,10 @@ services:
 
     depends_on:
       - mongodb
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+      - wekan-tmp:/tmp
 
 #---------------------------------------------------------------------------------
 # ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ====
@@ -638,9 +648,6 @@ volumes:
     driver: local
   wekan-tmp:
     driver: local
-  - /etc/localtime:/etc/localtime:ro
-  - /etc/timezone:/etc/timezone:ro
-  - ./volumes/wekan-tmp:/tmp
 
 networks:
   wekan-tier: