From 7b5f02b4c8fdaa66a01d528ea338a76fe1b9f974 Mon Sep 17 00:00:00 2001 From: Gavin Lilly Date: Sat, 9 Feb 2019 23:22:22 +0000 Subject: Added Kadira packages and env settings in Docker Compose --- docker-compose.yml | 73 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 18 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index abcaa48b..951c705e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -98,7 +98,7 @@ services: #------------------------------------------------------------------------------------- container_name: wekan-db restart: always - command: mongod --smallfiles --oplogSize 128 + command: mongod --smallfiles --replSet kadira --oplogSize 128 networks: - wekan-tier expose: @@ -129,26 +129,26 @@ 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. # For example, if you want to have wekan on port 3001, # use 3001:8080 . Do not add any extra address etc here, that way it does not work. # remove port mapping if you use nginx reverse proxy, port 8080 is already exposed to wekan-tier network - - 80:8080 + - 3000:8080 environment: - - MONGO_URL=mongodb://wekandb:27017/wekan + - MONGO_URL=mongodb://wekandb:27017/wekan?replicaSet=kadira #--------------------------------------------------------------- # ==== ROOT_URL SETTING ==== # Change ROOT_URL to your real Wekan URL, for example: @@ -161,7 +161,7 @@ services: # - http://example.com # - http://boards.example.com # - http://192.168.1.100 <=== using at local LAN - - ROOT_URL=http://localhost # <=== using only at same laptop/desktop where Wekan is installed + - ROOT_URL=http://frigg:3000 # <=== using only at same laptop/desktop where Wekan is installed #--------------------------------------------------------------- # ==== EMAIL SETTINGS ==== # Email settings are required in both MAIL_URL and Admin Panel, @@ -169,8 +169,8 @@ services: # For SSL in email, change smtp:// to smtps:// # NOTE: Special characters need to be url-encoded in MAIL_URL. # You can encode those characters for example at: https://www.urlencoder.org - - MAIL_URL=smtp://user:pass@mailserver.example.com:25/ - - MAIL_FROM='Example Wekan Support ' + #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/ + #- MAIL_FROM='Example Wekan Support ' #--------------------------------------------------------------- # ==== OPTIONAL: MONGO OPLOG SETTINGS ===== # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-378343587 @@ -193,7 +193,9 @@ services: # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ==== # https://github.com/smeijer/kadira # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f - # - export KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011 + - KADIRA_OPTIONS_ENDPOINT=http://kadira-engine:11011 + - KADIRA_APP_ID=iYpPgq6rXRrZJty4A + - KADIRA_APP_SECRET=9de2728b-320d-46c1-9352-0084435411f0 #--------------------------------------------------------------- # ==== OPTIONAL: LOGS AND STATS ==== # https://github.com/wekan/wekan/wiki/Logs @@ -510,6 +512,41 @@ services: # - ./nginx/nginx.conf:/etc/nginx/nginx.conf + kadira-engine: + ## This is the endpoint where Meteor app sends performance data + image: vladgolubev/kadira-engine + ports: + - "11011:11011" + environment: + - PORT=11011 + - MONGO_URL=mongodb://wekandb:27017/kadira?replicaSet=kadira + - MONGO_SHARD_URL_one=mongodb://wekandb:27017/kadira?replicaSet=kadira + networks: + - wekan-tier + restart: always + + kadira-rma: + ## This computes statistics databases every minute. + image: vladgolubev/kadira-rma + environment: + - MONGO_URL=mongodb://wekandb:27017/kadira + networks: + - wekan-tier + restart: always + + kadira-ui: + ## Meteor app that presents the Kadira user interface. + image: vladgolubev/kadira-ui + ports: + #- "80:4000" + - "4000:4000" + environment: + - MONGO_URL=mongodb://wekandb:27017/kadira + - MONGO_SHARD_URL_one=mongodb://wekandb:27017/kadira + networks: + - wekan-tier + restart: always + volumes: wekan-db: driver: local -- cgit v1.2.3-1-g7c22 From 905c45f225809769268e1aaa64d30c1d44254f15 Mon Sep 17 00:00:00 2001 From: Gavin Lilly Date: Mon, 11 Feb 2019 16:43:52 +0000 Subject: Replaced Kadira by meteor-apm-agent --- docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 951c705e..ddd293a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -123,7 +123,7 @@ services: # image: wekanteam/wekan:v1.95 #------------------------------------------------------------------------------------- container_name: wekan-app - restart: always + restart: "no" networks: - wekan-tier #------------------------------------------------------------------------------------- @@ -148,7 +148,7 @@ services: # remove port mapping if you use nginx reverse proxy, port 8080 is already exposed to wekan-tier network - 3000:8080 environment: - - MONGO_URL=mongodb://wekandb:27017/wekan?replicaSet=kadira + - MONGO_URL=mongodb://wekandb:27017/wekan #--------------------------------------------------------------- # ==== ROOT_URL SETTING ==== # Change ROOT_URL to your real Wekan URL, for example: @@ -193,9 +193,9 @@ services: # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ==== # https://github.com/smeijer/kadira # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f - - KADIRA_OPTIONS_ENDPOINT=http://kadira-engine:11011 - - KADIRA_APP_ID=iYpPgq6rXRrZJty4A - - KADIRA_APP_SECRET=9de2728b-320d-46c1-9352-0084435411f0 + - APM_OPTIONS_ENDPOINT=http://kadira-engine:11011 + - APM_APP_ID=iYpPgq6rXRrZJty4A + - APM_APP_SECRET=9de2728b-320d-46c1-9352-0084435411f0 #--------------------------------------------------------------- # ==== OPTIONAL: LOGS AND STATS ==== # https://github.com/wekan/wekan/wiki/Logs -- cgit v1.2.3-1-g7c22 From 595a2d2baa0bb99154d19a5dc324029481f864b0 Mon Sep 17 00:00:00 2001 From: Gavin Lilly Date: Wed, 13 Feb 2019 00:00:34 +0000 Subject: Cleaning up docker-compose for merge --- docker-compose.yml | 78 +++++++++++++++--------------------------------------- 1 file changed, 22 insertions(+), 56 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 5d39cb07..03b578b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -98,7 +98,7 @@ services: #------------------------------------------------------------------------------------- container_name: wekan-db restart: always - command: mongod --smallfiles --replSet kadira --oplogSize 128 + command: mongod --smallfiles --oplogSize 128 networks: - wekan-tier expose: @@ -123,30 +123,30 @@ services: # image: wekanteam/wekan:v1.95 #------------------------------------------------------------------------------------- container_name: wekan-app - restart: "no" + restart: always networks: - 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 - 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. # For example, if you want to have wekan on port 3001, # use 3001:8080 . Do not add any extra address etc here, that way it does not work. # remove port mapping if you use nginx reverse proxy, port 8080 is already exposed to wekan-tier network - - 3000:8080 + - 80:8080 environment: - MONGO_URL=mongodb://wekandb:27017/wekan #--------------------------------------------------------------- @@ -161,7 +161,7 @@ services: # - http://example.com # - http://boards.example.com # - http://192.168.1.100 <=== using at local LAN - - ROOT_URL=http://frigg:3000 # <=== using only at same laptop/desktop where Wekan is installed + - ROOT_URL=http://localhost # <=== using only at same laptop/desktop where Wekan is installed #--------------------------------------------------------------- # ==== EMAIL SETTINGS ==== # Email settings are required in both MAIL_URL and Admin Panel, @@ -169,8 +169,8 @@ services: # For SSL in email, change smtp:// to smtps:// # NOTE: Special characters need to be url-encoded in MAIL_URL. # You can encode those characters for example at: https://www.urlencoder.org - #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/ - #- MAIL_FROM='Example Wekan Support ' + - MAIL_URL=smtp://user:pass@mailserver.example.com:25/ + - MAIL_FROM='Example Wekan Support ' #--------------------------------------------------------------- # ==== OPTIONAL: MONGO OPLOG SETTINGS ===== # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-378343587 @@ -191,11 +191,12 @@ services: # - MONGO_OPLOG_URL=mongodb://:@/local?authSource=admin&replicaSet=rsWekan #--------------------------------------------------------------- # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ==== - # https://github.com/smeijer/kadira + # https://github.com/edemaine/kadira-compose + # https://github.com/meteor/meteor-apm-agent # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f - - APM_OPTIONS_ENDPOINT=http://kadira-engine:11011 - - APM_APP_ID=iYpPgq6rXRrZJty4A - - APM_APP_SECRET=9de2728b-320d-46c1-9352-0084435411f0 + #- APM_OPTIONS_ENDPOINT=http://:11011 + #- APM_APP_ID= + #- APM_APP_SECRET= #--------------------------------------------------------------- # ==== OPTIONAL: LOGS AND STATS ==== # https://github.com/wekan/wekan/wiki/Logs @@ -515,41 +516,6 @@ services: # - ./nginx/nginx.conf:/etc/nginx/nginx.conf - kadira-engine: - ## This is the endpoint where Meteor app sends performance data - image: vladgolubev/kadira-engine - ports: - - "11011:11011" - environment: - - PORT=11011 - - MONGO_URL=mongodb://wekandb:27017/kadira?replicaSet=kadira - - MONGO_SHARD_URL_one=mongodb://wekandb:27017/kadira?replicaSet=kadira - networks: - - wekan-tier - restart: always - - kadira-rma: - ## This computes statistics databases every minute. - image: vladgolubev/kadira-rma - environment: - - MONGO_URL=mongodb://wekandb:27017/kadira - networks: - - wekan-tier - restart: always - - kadira-ui: - ## Meteor app that presents the Kadira user interface. - image: vladgolubev/kadira-ui - ports: - #- "80:4000" - - "4000:4000" - environment: - - MONGO_URL=mongodb://wekandb:27017/kadira - - MONGO_SHARD_URL_one=mongodb://wekandb:27017/kadira - networks: - - wekan-tier - restart: always - volumes: wekan-db: driver: local -- cgit v1.2.3-1-g7c22 From b66f471e530d41a3f12e4bfc29548313e9a73c35 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 13 Feb 2019 03:01:10 +0200 Subject: - Add configurable settings OAUTH2_ID_TOKEN_WHITELIST_FIELDS and OAUTH2_REQUEST_PERMISSIONS. Thanks to xet7. Related #1874 --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 7a1f7b87..a9f11569 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -311,6 +311,10 @@ services: #- OAUTH2_FULLNAME_MAP= # OAuth2 Email Mapping #- OAUTH2_EMAIL_MAP= + # OAUTH2 ID Token Whitelist Fields. + #- OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] + # OAUTH2 Request Permissions. + #- OAUTH2_REQUEST_PERMISSIONS=[openid email profile] #----------------------------------------------------------------- # ==== LDAP ==== # https://github.com/wekan/wekan/wiki/LDAP -- cgit v1.2.3-1-g7c22