From e9006a234bdf684c03c7bb3aac67753fe759ac2a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 24 Dec 2018 16:29:53 +0200 Subject: - Fix docker-compose.yml to use Meteor 1.6.x based Wekan, because currently Meteor 1.8.x based version is broken. Thanks to xet7 ! --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 804a127f..8b0418fd 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 -- cgit v1.2.3-1-g7c22 From c502ab95009fc5814f1b96b45c6503313551578d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 24 Dec 2018 18:18:41 +0200 Subject: - Revert "Improve authentication" and "Default Authentication Method" to make login work again. - Fixes to docker-compose.yml so that Wekan Meteor 1.6.x version would work. Most likely Meteor 1.8.x version is still broken. Thanks to xet7 ! --- docker-compose.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 8b0418fd..085d511e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -128,17 +128,18 @@ services: - wekan-tier #------------------------------------------------------------------------------------- # ==== BUILD wekan-app DOCKER CONTAINER FROM SOURCE, if you uncomment these ==== - #build: - # context: . - # dockerfile: Dockerfile - # args: - # - NODE_VERSION=${NODE_VERSION} - # - METEOR_RELEASE=${METEOR_RELEASE} - # - NPM_VERSION=${NPM_VERSION} - # - ARCHITECTURE=${ARCHITECTURE} - # - SRC_PATH=${SRC_PATH} - # - METEOR_EDGE=${METEOR_EDGE} - # - USE_EDGE=${USE_EDGE} + # ==== and use commands: docker-compose up -d --build + build: + context: . + dockerfile: Dockerfile + args: + - NODE_VERSION=${NODE_VERSION} + - METEOR_RELEASE=${METEOR_RELEASE} + - NPM_VERSION=${NPM_VERSION} + - ARCHITECTURE=${ARCHITECTURE} + - SRC_PATH=${SRC_PATH} + - METEOR_EDGE=${METEOR_EDGE} + - USE_EDGE=${USE_EDGE} #------------------------------------------------------------------------------------- ports: # Docker outsideport:insideport. Do not add anything extra here. -- cgit v1.2.3-1-g7c22 From f60429efdfd485c10212392e55f773726c3fb24e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 24 Dec 2018 18:24:32 +0200 Subject: - Comment out docker build from source part of docker-compose.yml Thanks to xet7 ! --- docker-compose.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 085d511e..9d635a33 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -129,17 +129,17 @@ services: #------------------------------------------------------------------------------------- # ==== BUILD wekan-app DOCKER CONTAINER FROM SOURCE, if you uncomment these ==== # ==== and use commands: docker-compose up -d --build - build: - context: . - dockerfile: Dockerfile - args: - - NODE_VERSION=${NODE_VERSION} - - METEOR_RELEASE=${METEOR_RELEASE} - - NPM_VERSION=${NPM_VERSION} - - ARCHITECTURE=${ARCHITECTURE} - - SRC_PATH=${SRC_PATH} - - METEOR_EDGE=${METEOR_EDGE} - - USE_EDGE=${USE_EDGE} + #build: + # context: . + # dockerfile: Dockerfile + # args: + # - NODE_VERSION=${NODE_VERSION} + # - METEOR_RELEASE=${METEOR_RELEASE} + # - NPM_VERSION=${NPM_VERSION} + # - ARCHITECTURE=${ARCHITECTURE} + # - SRC_PATH=${SRC_PATH} + # - METEOR_EDGE=${METEOR_EDGE} + # - USE_EDGE=${USE_EDGE} #------------------------------------------------------------------------------------- ports: # Docker outsideport:insideport. Do not add anything extra here. -- cgit v1.2.3-1-g7c22