From 206828b440f8522bdc6ebd901c020e9deae70e04 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 9 Nov 2021 14:33:41 +0100 Subject: [PATCH 1/3] Docker: Fix "Failed export and unexpected container restart" - Fixes #4089 Also this was broken too: docker-compose exec wekandb apt-get update because /tmp didn't exist, it was introduced by this commit: 1322c1fbbd82eff1ec9d4ac1265007c043a86a1c --- .devcontainer/Dockerfile | 2 +- .devcontainer/docker-compose.yml | 13 ++----------- Dockerfile | 2 +- docker-compose.yml | 3 --- torodb-postgresql/docker-compose.yml | 6 ------ 5 files changed, 4 insertions(+), 22 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 031fe5da3..6f0a2f38d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -236,7 +236,7 @@ RUN \ set -o xtrace && \ apt-get clean -y && \ apt-get autoremove -y && \ - rm -Rf /tmp* && \ + rm -Rf /tmp/* && \ rm -Rf /home/wekan/app_build && \ rm -Rf /var/cache/apt /var/lib/apt/lists && \ rm -Rf /var/lib/apt/lists/* diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index adada5110..4d6d50534 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 - - wekan-db:/data/db - - wekan-db-dump:/dump + - ./volumes/wekan-db:/data/db + - ./volumes/wekan-db-dump:/dump wekan-dev: container_name: wekan-dev-app @@ -45,15 +45,6 @@ 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/Dockerfile b/Dockerfile index 002d8eeef..a57ac7eae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -309,7 +309,7 @@ RUN \ apt-get remove --purge -y ${BUILD_DEPS} && \ apt-get autoremove -y && \ npm uninstall -g api2html &&\ - rm -R /tmp* && \ + rm -R /tmp/* && \ rm -R /var/lib/apt/lists/* && \ rm -R /home/wekan/.meteor && \ rm -R /home/wekan/app && \ diff --git a/docker-compose.yml b/docker-compose.yml index 10e066cea..79f7fe6d2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -664,7 +664,6 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro - - wekan-tmp:/tmp #--------------------------------------------------------------------------------- # ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ==== @@ -720,8 +719,6 @@ volumes: driver: local wekan-db-dump: driver: local - wekan-tmp: - driver: local networks: wekan-tier: diff --git a/torodb-postgresql/docker-compose.yml b/torodb-postgresql/docker-compose.yml index f78686a3e..dd421c1ac 100644 --- a/torodb-postgresql/docker-compose.yml +++ b/torodb-postgresql/docker-compose.yml @@ -139,9 +139,6 @@ services: 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 @@ -613,7 +610,6 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro - - wekan-tmp:/tmp #--------------------------------------------------------------------------------- # ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ==== @@ -646,8 +642,6 @@ volumes: driver: local mongodb-dump: driver: local - wekan-tmp: - driver: local networks: wekan-tier: From f9c9f2a4533d1040e12b4599c0cf8adc571505e9 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 9 Nov 2021 14:43:44 +0100 Subject: [PATCH 2/3] Docker: torodb-postgresql has now shared volumes of /etc/localtime and /etc/timezone too --- torodb-postgresql/docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/torodb-postgresql/docker-compose.yml b/torodb-postgresql/docker-compose.yml index dd421c1ac..a46de5fb0 100644 --- a/torodb-postgresql/docker-compose.yml +++ b/torodb-postgresql/docker-compose.yml @@ -108,6 +108,9 @@ services: - TORODB_BACKEND_USER=wekan - TORODB_BACKEND_PASSWORD=wekan - DEBUG + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro postgres: image: quay.io/wekan/postgres:9.6 networks: @@ -116,6 +119,9 @@ services: - POSTGRES_PASSWORD=wekan ports: - "5432:5432" + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro mongodb: image: mongo:3.2 networks: From 9868b3b6af68fb9bdd19c064ed4f1abc30fcaead Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Thu, 11 Nov 2021 19:11:45 +0100 Subject: [PATCH 3/3] docker-compose, remove /etc/timezone because it's not available on some Linux systems See discussion #4131 --- .devcontainer/docker-compose.yml | 2 -- docker-compose.yml | 1 - torodb-postgresql/docker-compose.yml | 4 ---- 3 files changed, 7 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 4d6d50534..67e85fcf7 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -13,7 +13,6 @@ services: - 27017 volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - ./volumes/wekan-db:/data/db - ./volumes/wekan-db-dump:/dump @@ -38,7 +37,6 @@ services: - wekandb-dev volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - ../client:/home/wekan/app/client - ../models:/home/wekan/app/models - ../config:/home/wekan/app/config diff --git a/docker-compose.yml b/docker-compose.yml index 79f7fe6d2..6243ab3f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -663,7 +663,6 @@ services: - wekandb volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro #--------------------------------------------------------------------------------- # ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ==== diff --git a/torodb-postgresql/docker-compose.yml b/torodb-postgresql/docker-compose.yml index a46de5fb0..0e3181bc0 100644 --- a/torodb-postgresql/docker-compose.yml +++ b/torodb-postgresql/docker-compose.yml @@ -110,7 +110,6 @@ services: - DEBUG volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro postgres: image: quay.io/wekan/postgres:9.6 networks: @@ -121,7 +120,6 @@ services: - "5432:5432" volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro mongodb: image: mongo:3.2 networks: @@ -144,7 +142,6 @@ services: mongod --replSet rs1 volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro wekan: image: quay.io/wekan/wekan container_name: wekan-app @@ -615,7 +612,6 @@ services: - mongodb volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro #--------------------------------------------------------------------------------- # ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ====