diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-12-24 18:27:49 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-12-24 18:27:49 +0200 |
| commit | 236c99b39f7b89bf0751684b88ebfaa331211d3e (patch) | |
| tree | a5488cfd8862aae6a40d2cceeab43ed53274750e /docker-compose.yml | |
| parent | 5488b68b9b603a7e3caab7d21f1d0e0d7eeecf00 (diff) | |
| parent | 67b76558fc0ff25fa01ce20cbb29a26b6f7aebbd (diff) | |
| download | wekan-236c99b39f7b89bf0751684b88ebfaa331211d3e.tar.gz wekan-236c99b39f7b89bf0751684b88ebfaa331211d3e.tar.bz2 wekan-236c99b39f7b89bf0751684b88ebfaa331211d3e.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 804a127f..9d635a33 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -90,11 +90,11 @@ services: wekandb: #------------------------------------------------------------------------------------- # ==== MONGODB AND METEOR VERSION ==== - # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch, use mongo 4.x - image: mongo:4.0.4 + # a) CURRENTLY BROKEN: For Wekan Meteor 1.8.x version at meteor-1.8 branch, use mongo 4.x + # image: mongo:4.0.4 # b) For Wekan Meteor 1.6.x version at master/devel/edge branches. # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x - # image: mongo:3.2.21 + image: mongo:3.2.21 #------------------------------------------------------------------------------------- container_name: wekan-db restart: always @@ -110,12 +110,12 @@ services: wekan: #------------------------------------------------------------------------------------- # ==== MONGODB AND METEOR VERSION ==== - # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch, + # a) CURRENTLY BROKEN: For Wekan Meteor 1.8.x version at meteor-1.8 branch, # using https://quay.io/wekan/wekan automatic builds - image: quay.io/wekan/wekan:meteor-1.8 + # image: quay.io/wekan/wekan:meteor-1.8 # b) For Wekan Meteor 1.6.x version at master/devel/edge branches. # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x - # image: quay.io/wekan/wekan + image: quay.io/wekan/wekan # c) Using specific Meteor 1.6.x version tag: # image: quay.io/wekan/wekan:v1.95 # c) Using Docker Hub automatic builds https://hub.docker.com/r/wekanteam/wekan @@ -128,6 +128,7 @@ services: - wekan-tier #------------------------------------------------------------------------------------- # ==== BUILD wekan-app DOCKER CONTAINER FROM SOURCE, if you uncomment these ==== + # ==== and use commands: docker-compose up -d --build #build: # context: . # dockerfile: Dockerfile |