From d5e09cf1c6644d736292820beb181ba8545ed33d Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Sun, 4 Apr 2021 21:56:52 +0200 Subject: [PATCH] Sync label for new Mongo version --- compose.yml | 66 ++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/compose.yml b/compose.yml index 30d61e2..12d96ef 100644 --- a/compose.yml +++ b/compose.yml @@ -1,6 +1,4 @@ ---- version: '3.8' - services: app: image: rocketchat/rocket.chat:3.12.3 @@ -30,6 +28,8 @@ services: entrypoint: /docker-entrypoint.sh command: > bash -c + + "for i in `seq 1 30`; do node main.js && s=$$? && break || s=$$?; @@ -56,24 +56,27 @@ services: - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - db: image: mongo:3.7 volumes: - - mongo:/data/db - #- ./data/dump:/dump + - mongo:/data/db + #- ./data/dump:/dump command: mongod --smallfiles --oplogSize 128 --replSet rs0 networks: - internal labels: - "traefik.enable=false" - + deploy: + labels: + - coop-cloud.${STACK_NAME}.db.version=3.7-736eec20 # this container's job is just run the command to initialize the replica set. # it will run the command and remove himself (it will not stay running) mongo-init-replica: image: mongo:4.0 command: > bash -c + + "for i in `seq 1 30`; do mongo db/rocketchat --eval \" rs.initiate({ @@ -87,43 +90,38 @@ services: - db networks: - internal - - # hubot, the popular chatbot (add the bot user first and change the password before starting this image) - #hubot: - # image: rocketchat/hubot-rocketchat:latest - # restart: unless-stopped - # environment: - # - ROCKETCHAT_URL=rocketchat:3000 - # - ROCKETCHAT_ROOM=GENERAL - # - ROCKETCHAT_USER=bot - # - ROCKETCHAT_PASSWORD=botpassword - # - BOT_NAME=bot - # # you can add more scripts as you'd like here, they need to be installable by npm - # - EXTERNAL_SCRIPTS=hubot-help,hubot-seen,hubot-links,hubot-diagnostics - # depends_on: - # - rocketchat - # labels: - # - "traefik.enable=false" - # volumes: - # - hubot_scripts:/home/hubot/scripts - # # this is used to expose the hubot port for notifications on the host on port 3001, e.g. for hubot-jenkins-notifier - # #ports: - # # - 3001:8080 - + # hubot, the popular chatbot (add the bot user first and change the password before starting this image) + #hubot: + # image: rocketchat/hubot-rocketchat:latest + # restart: unless-stopped + # environment: + # - ROCKETCHAT_URL=rocketchat:3000 + # - ROCKETCHAT_ROOM=GENERAL + # - ROCKETCHAT_USER=bot + # - ROCKETCHAT_PASSWORD=botpassword + # - BOT_NAME=bot + # # you can add more scripts as you'd like here, they need to be installable by npm + # - EXTERNAL_SCRIPTS=hubot-help,hubot-seen,hubot-links,hubot-diagnostics + # depends_on: + # - rocketchat + # labels: + # - "traefik.enable=false" + # volumes: + # - hubot_scripts:/home/hubot/scripts + # # this is used to expose the hubot port for notifications on the host on port 3001, e.g. for hubot-jenkins-notifier + # #ports: + # # - 3001:8080 networks: proxy: external: true internal: - volumes: rocketchat_uploads: mongo: - secrets: - admin_password: - external: true + admin_password: + external: true name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION} - configs: entrypoint_conf: name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION}