diff options
author | Gavin Lilly <gavtherav@gmail.com> | 2019-02-13 00:00:34 +0000 |
---|---|---|
committer | Gavin Lilly <gavtherav@gmail.com> | 2019-02-13 00:00:34 +0000 |
commit | 595a2d2baa0bb99154d19a5dc324029481f864b0 (patch) | |
tree | 819d65e2252de95b61a273ff21b982d9424b66fd | |
parent | 227772bc332228a779c8e85dd690474d6ea92bfa (diff) | |
download | wekan-595a2d2baa0bb99154d19a5dc324029481f864b0.tar.gz wekan-595a2d2baa0bb99154d19a5dc324029481f864b0.tar.bz2 wekan-595a2d2baa0bb99154d19a5dc324029481f864b0.zip |
Cleaning up docker-compose for merge
-rw-r--r-- | docker-compose.yml | 78 |
1 files changed, 22 insertions, 56 deletions
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 <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 @@ -191,11 +191,12 @@ services: # - MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/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://<kadira-ip>: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 |