diff --git a/README.md b/README.md index 4c10e24..883e34a 100644 --- a/README.md +++ b/README.md @@ -370,13 +370,6 @@ db.invites.insertOne({ _id: "enter_an_invite_code_here" }) > - Rename config section `api.vapid` -> `pushd.vapid` > - Rename config section `api.fcm` -> `pushd.fcm` > - Rename config section `api.apn` -> `pushd.apn` -> - The following fields are needed when using the provided docker compose: -> ```toml -> [rabbit] -> host = "rabbit" -> username = "rabbituser" -> password = "rabbitpass" -> ``` > > These will NOT automatically be applied to your config, and must be changed/added manually. > diff --git a/compose.yml b/compose.yml index 16a6a90..6beb91e 100644 --- a/compose.yml +++ b/compose.yml @@ -72,7 +72,7 @@ services: # API server (delta) api: - image: ghcr.io/revoltchat/server:20241128-2 + image: ghcr.io/revoltchat/server:20241128-3 depends_on: database: condition: service_healthy @@ -86,10 +86,12 @@ services: # Events service (quark) events: - image: ghcr.io/revoltchat/bonfire:20241128-2 + image: ghcr.io/revoltchat/bonfire:20241128-3 depends_on: - - database - - redis + database: + condition: service_healthy + redis: + condition: service_started volumes: - ./Revolt.toml:/Revolt.toml restart: always @@ -102,24 +104,26 @@ services: # File server (autumn) autumn: - image: ghcr.io/revoltchat/autumn:20241128-2 + image: ghcr.io/revoltchat/autumn:20241128-3 depends_on: - - database - - createbuckets + database: + condition: service_healthy + createbuckets: + condition: service_started volumes: - ./Revolt.toml:/Revolt.toml restart: always # Metadata and image proxy (january) january: - image: ghcr.io/revoltchat/january:20241024-1 + image: ghcr.io/revoltchat/january:20241128-3 volumes: - ./Revolt.toml:/Revolt.toml restart: always # Push notification daemon (pushd) pushd: - image: ghcr.io/revoltchat/pushd:20241128-2 + image: ghcr.io/revoltchat/pushd:20241128-3 depends_on: database: condition: service_healthy diff --git a/generate_config.sh b/generate_config.sh index 4326e4d..f448abb 100644 --- a/generate_config.sh +++ b/generate_config.sh @@ -12,13 +12,6 @@ echo "events = \"wss://$1/ws\"" >> Revolt.toml echo "autumn = \"https://$1/autumn\"" >> Revolt.toml echo "january = \"https://$1/january\"" >> Revolt.toml -# Rabbit target, since rabbit isn't set up for docker by default -echo "" >> Revolt.toml -echo "[rabbit]" >> Revolt.toml -echo "host = \"rabbit\"" >> Revolt.toml -echo "user = \"rabbituser\"" >> Revolt.toml -echo "password = \"rabbitpass\"" >> Revolt.toml - # VAPID keys echo "" >> Revolt.toml echo "[pushd.vapid]" >> Revolt.toml