diff options
| -rw-r--r-- | .meteor/packages | 1 | ||||
| -rw-r--r-- | .meteor/versions | 1 | ||||
| -rw-r--r-- | docker-compose.yml | 73 |
3 files changed, 57 insertions, 18 deletions
diff --git a/.meteor/packages b/.meteor/packages index 88a0cae6..274a8d0d 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -90,3 +90,4 @@ wekan:wekan-ldap wekan:accounts-cas wekan-scrollbar mquandalle:perfect-scrollbar +mdg:meteor-apm-agent diff --git a/.meteor/versions b/.meteor/versions index 5d4c8e1a..5477519e 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -90,6 +90,7 @@ meteor-base@1.2.0 meteor-platform@1.2.6 meteorhacks:aggregate@1.3.0 meteorhacks:collection-utils@1.2.0 +meteorhacks:kadira@2.30.4 meteorhacks:meteorx@1.4.1 meteorhacks:picker@1.0.3 meteorhacks:subs-manager@1.6.4 diff --git a/docker-compose.yml b/docker-compose.yml index 2d1757c8..5d39cb07 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: @@ -123,30 +123,30 @@ services: # image: wekanteam/wekan:v1.95 #------------------------------------------------------------------------------------- container_name: wekan-app - restart: always + restart: "no" 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 - - 80:8080 + - 3000: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://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 <support@example.com>' + #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/ + #- MAIL_FROM='Example Wekan Support <support@example.com>' #--------------------------------------------------------------- # ==== 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 + - 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 @@ -513,6 +515,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 |