From 96709e1088c3369fcee7679f6ea81474042d043b Mon Sep 17 00:00:00 2001 From: ralf Date: Tue, 9 Jul 2024 09:29:11 +0200 Subject: [PATCH] fix (commented out) rocketchat to work with latest versions --- doc/docker/development/docker-compose.yml | 20 +++++++++++++++----- doc/docker/development/nginx.conf | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/doc/docker/development/docker-compose.yml b/doc/docker/development/docker-compose.yml index 545055bfdd..08ed229019 100644 --- a/doc/docker/development/docker-compose.yml +++ b/doc/docker/development/docker-compose.yml @@ -227,7 +227,7 @@ services: # Rocket.Chat server #rocketchat: - # image: quay.io/egroupware/rocket.chat:latest + # image: quay.io/egroupware/rocket.chat:stable6 # command: > # sh -c # "while true; do @@ -248,8 +248,8 @@ services: # # IMPORTANT: change ROOT_URL to your actual url eg. https://domain.com/rocketchat # - ROOT_URL=http://localhost/rocketchat # - PORT=3000 - # - MONGO_URL=mongodb://mongo:27017/rocketchat - # - MONGO_OPLOG_URL=mongodb://mongo:27017/local + # - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs0&directConnection=true + # - MONGO_OPLOG_URL=mongodb://mongo:27017/local?replicaSet=rs0&directConnection=true # # - HTTP_PROXY=http://proxy.domain.com # # - HTTPS_PROXY=http://proxy.domain.com # depends_on: @@ -267,13 +267,23 @@ services: # volumes: # - mongo:/data/db # - $PWD/data/default/rocketchat/dump:/dump - # command: mongod --oplogSize 128 --replSet rs0 + # command: mongod --oplogSize 128 --replSet rs0 --storageEngine=wiredTiger # container_name: rocketchat-mongo # 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:5.0 - # command: 'bash -c "for i in `seq 1 30`; do mongo mongo/rocketchat --eval \"rs.initiate({ _id: ''rs0'', members: [ { _id: 0, host: ''localhost:27017'' } ]})\" && s=$$? && break || s=$$?; echo \"Tried $$i times. Waiting 5 secs...\"; sleep 5; done; (exit $$s)"' + # command: > + # bash -c + # "for (( ; ; )); do + # mongo mongo/rocketchat --eval \" + # rs.initiate({ + # _id: 'rs0', + # members: [ { _id: 0, host: 'localhost:27017' } ]})\" && + # s=$$? && break || s=$$?; + # echo \"Could not reach MongoDB. Waiting 5 secs ...\"; + # sleep 5; + # done; (exit $$s)" # depends_on: # - mongo diff --git a/doc/docker/development/nginx.conf b/doc/docker/development/nginx.conf index 1eb00d0d46..269acfcfa8 100644 --- a/doc/docker/development/nginx.conf +++ b/doc/docker/development/nginx.conf @@ -163,7 +163,7 @@ server { } # proxy into rocketchat container - #location /rocketchat { + #location / { # proxy_pass http://rocketchat:3000; # proxy_set_header Upgrade $http_upgrade; # proxy_set_header Connection "upgrade";