mirror of
https://github.com/wekan/wekan.git
synced 2025-04-22 04:57:07 -04:00
Merge pull request #4137 from mfilser/docker_fix_failed_export_and_timezone
Docker fix failed export and timezone
This commit is contained in:
commit
c5eca7f3ec
5 changed files with 8 additions and 27 deletions
|
@ -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/*
|
||||
|
|
|
@ -13,9 +13,8 @@ services:
|
|||
- 27017
|
||||
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
|
||||
|
@ -38,22 +37,12 @@ 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
|
||||
- ../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:
|
||||
|
|
|
@ -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 && \
|
||||
|
|
|
@ -663,8 +663,6 @@ services:
|
|||
- wekandb
|
||||
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 +718,6 @@ volumes:
|
|||
driver: local
|
||||
wekan-db-dump:
|
||||
driver: local
|
||||
wekan-tmp:
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
wekan-tier:
|
||||
|
|
|
@ -108,6 +108,8 @@ services:
|
|||
- TORODB_BACKEND_USER=wekan
|
||||
- TORODB_BACKEND_PASSWORD=wekan
|
||||
- DEBUG
|
||||
volumes:
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
postgres:
|
||||
image: quay.io/wekan/postgres:9.6
|
||||
networks:
|
||||
|
@ -116,6 +118,8 @@ services:
|
|||
- POSTGRES_PASSWORD=wekan
|
||||
ports:
|
||||
- "5432:5432"
|
||||
volumes:
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
mongodb:
|
||||
image: mongo:3.2
|
||||
networks:
|
||||
|
@ -138,10 +142,6 @@ services:
|
|||
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
|
||||
|
@ -612,8 +612,6 @@ services:
|
|||
- mongodb
|
||||
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 +644,6 @@ volumes:
|
|||
driver: local
|
||||
mongodb-dump:
|
||||
driver: local
|
||||
wekan-tmp:
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
wekan-tier:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue