Bläddra i källkod

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
Martin Filser 3 år sedan
förälder
incheckning
206828b440

+ 1 - 1
.devcontainer/Dockerfile

@@ -236,7 +236,7 @@ RUN \
     set -o xtrace && \
     set -o xtrace && \
     apt-get clean -y && \
     apt-get clean -y && \
     apt-get autoremove -y && \
     apt-get autoremove -y && \
-    rm -Rf /tmp* && \
+    rm -Rf /tmp/* && \
     rm -Rf /home/wekan/app_build && \
     rm -Rf /home/wekan/app_build && \
     rm -Rf /var/cache/apt /var/lib/apt/lists && \
     rm -Rf /var/cache/apt /var/lib/apt/lists && \
     rm -Rf /var/lib/apt/lists/*
     rm -Rf /var/lib/apt/lists/*

+ 2 - 11
.devcontainer/docker-compose.yml

@@ -14,8 +14,8 @@ services:
     volumes:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone: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:
   wekan-dev:
     container_name: wekan-dev-app
     container_name: wekan-dev-app
@@ -45,15 +45,6 @@ services:
       - ../i18n:/home/wekan/app/i18n
       - ../i18n:/home/wekan/app/i18n
       - ../server:/home/wekan/app/server
       - ../server:/home/wekan/app/server
       - ../public:/home/wekan/app/public
       - ../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:
 networks:
   wekan-dev-tier:
   wekan-dev-tier:

+ 1 - 1
Dockerfile

@@ -309,7 +309,7 @@ RUN \
     apt-get remove --purge -y ${BUILD_DEPS} && \
     apt-get remove --purge -y ${BUILD_DEPS} && \
     apt-get autoremove -y && \
     apt-get autoremove -y && \
     npm uninstall -g api2html &&\
     npm uninstall -g api2html &&\
-    rm -R /tmp* && \
+    rm -R /tmp/* && \
     rm -R /var/lib/apt/lists/* && \
     rm -R /var/lib/apt/lists/* && \
     rm -R /home/wekan/.meteor && \
     rm -R /home/wekan/.meteor && \
     rm -R /home/wekan/app && \
     rm -R /home/wekan/app && \

+ 0 - 3
docker-compose.yml

@@ -664,7 +664,6 @@ services:
     volumes:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
       - /etc/timezone:/etc/timezone:ro
-      - wekan-tmp:/tmp
 
 
 #---------------------------------------------------------------------------------
 #---------------------------------------------------------------------------------
 # ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ====
 # ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ====
@@ -720,8 +719,6 @@ volumes:
     driver: local
     driver: local
   wekan-db-dump:
   wekan-db-dump:
     driver: local
     driver: local
-  wekan-tmp:
-    driver: local
 
 
 networks:
 networks:
   wekan-tier:
   wekan-tier:

+ 0 - 6
torodb-postgresql/docker-compose.yml

@@ -139,9 +139,6 @@ services:
     volumes:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
       - /etc/timezone:/etc/timezone:ro
-      - wekan-db:/data/db
-      - wekan-db-dump:/dump
-
   wekan:
   wekan:
     image: quay.io/wekan/wekan
     image: quay.io/wekan/wekan
     container_name: wekan-app
     container_name: wekan-app
@@ -613,7 +610,6 @@ services:
     volumes:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
       - /etc/timezone:/etc/timezone:ro
-      - wekan-tmp:/tmp
 
 
 #---------------------------------------------------------------------------------
 #---------------------------------------------------------------------------------
 # ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ====
 # ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ====
@@ -646,8 +642,6 @@ volumes:
     driver: local
     driver: local
   mongodb-dump:
   mongodb-dump:
     driver: local
     driver: local
-  wekan-tmp:
-    driver: local
 
 
 networks:
 networks:
   wekan-tier:
   wekan-tier: