Add optional mail relay & change service names
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
See compose-stacks/organising#19
This commit is contained in:
parent
53ae72f8a3
commit
50dfa63bd5
|
@ -3,7 +3,6 @@ export DOMAIN=rocketchat.example.com
|
||||||
export STACK_NAME=rocketchat
|
export STACK_NAME=rocketchat
|
||||||
export LETS_ENCRYPT_ENV=production
|
export LETS_ENCRYPT_ENV=production
|
||||||
|
|
||||||
# Keycloak settings
|
|
||||||
# https://docs.rocket.chat/guides/administrator-guides/settings-via-env-vars
|
# https://docs.rocket.chat/guides/administrator-guides/settings-via-env-vars
|
||||||
export ADMIN_USERNAME=admin
|
export ADMIN_USERNAME=admin
|
||||||
export ADMIN_EMAIL=rocketchat@example.com
|
export ADMIN_EMAIL=rocketchat@example.com
|
||||||
|
@ -19,3 +18,8 @@ export ENTRYPOINT_CONF_VERSION=v1
|
||||||
#export Accounts_OAuth_Custom-Keycloak-id="rocketchat"
|
#export Accounts_OAuth_Custom-Keycloak-id="rocketchat"
|
||||||
|
|
||||||
#export OAUTH_KEY_VERSION=v1
|
#export OAUTH_KEY_VERSION=v1
|
||||||
|
|
||||||
|
# SMTP
|
||||||
|
#export COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
|
||||||
|
#export SMTP_HOST="postfix_relay_app"
|
||||||
|
#export FROM_EMAIL="rocketchat@example.com"
|
||||||
|
|
|
@ -10,7 +10,11 @@
|
||||||
4. Edit `.envrc` - be sure to change `$DOMAIN` to something that resolves to
|
4. Edit `.envrc` - be sure to change `$DOMAIN` to something that resolves to
|
||||||
your Docker swarm box
|
your Docker swarm box
|
||||||
5. `direnv allow` (or `. .envrc`)
|
5. `direnv allow` (or `. .envrc`)
|
||||||
6. `abra secret_generate db_password v1`
|
6. Generate secrets:
|
||||||
|
```
|
||||||
|
abra secret_generate db_password v1
|
||||||
|
abra secret_generate admin_password v1
|
||||||
|
```
|
||||||
7. `abra deploy`
|
7. `abra deploy`
|
||||||
9. Open the configured domain in your browser to finish set-up
|
9. Open the configured domain in your browser to finish set-up
|
||||||
|
|
||||||
|
@ -23,7 +27,7 @@
|
||||||
2. `direnv allow` (or `source .envrc`)
|
2. `direnv allow` (or `source .envrc`)
|
||||||
3. Insert the OpenID secret into Docker: (FIXME add option for this to `abra`)
|
3. Insert the OpenID secret into Docker: (FIXME add option for this to `abra`)
|
||||||
```
|
```
|
||||||
echo "your-secret-string-from-keycloak" | docker secret create "${STACK_NAME}_openid_key_${VERSION}" -
|
echo "your-secret-string-from-keycloak" | docker secret create "${STACK_NAME}_openid_key_${VERSION}" -
|
||||||
```
|
```
|
||||||
4. `abra deploy`
|
4. `abra deploy`
|
||||||
5. You should now have a "Login via Keycloak" option on the login page
|
5. You should now have a "Login via Keycloak" option on the login page
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
---
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
environment:
|
||||||
|
- MAIL_URL=smtp://${SMTP_HOST}
|
||||||
|
- SMTP_Host=${SMTP_HOST}
|
||||||
|
- From_Email=${FROM_EMAIL}
|
||||||
|
networks:
|
||||||
|
- mail
|
||||||
|
|
||||||
|
networks:
|
||||||
|
mail:
|
||||||
|
external: true
|
15
compose.yml
15
compose.yml
|
@ -2,7 +2,7 @@
|
||||||
version: '3.8'
|
version: '3.8'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
rocketchat:
|
app:
|
||||||
image: rocketchat/rocket.chat:latest
|
image: rocketchat/rocket.chat:latest
|
||||||
command: >
|
command: >
|
||||||
bash -c
|
bash -c
|
||||||
|
@ -19,9 +19,8 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- PORT=3000
|
- PORT=3000
|
||||||
- ROOT_URL=https://${DOMAIN}
|
- ROOT_URL=https://${DOMAIN}
|
||||||
- MONGO_URL=mongodb://mongo:27017/rocketchat
|
- MONGO_URL=mongodb://db:27017/rocketchat
|
||||||
- MONGO_OPLOG_URL=mongodb://mongo:27017/local
|
- MONGO_OPLOG_URL=mongodb://db:27017/local
|
||||||
- MAIL_URL=smtp://smtp.email
|
|
||||||
- ADMIN_USERNAME
|
- ADMIN_USERNAME
|
||||||
- ADMIN_PASS_FILE=/run/secrets/admin_password
|
- ADMIN_PASS_FILE=/run/secrets/admin_password
|
||||||
- ADMIN_EMAIL
|
- ADMIN_EMAIL
|
||||||
|
@ -36,7 +35,7 @@ services:
|
||||||
- internal
|
- internal
|
||||||
- proxy
|
- proxy
|
||||||
depends_on:
|
depends_on:
|
||||||
- mongo
|
- db
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
|
@ -49,7 +48,7 @@ services:
|
||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
|
|
||||||
mongo:
|
db:
|
||||||
image: mongo:3.6
|
image: mongo:3.6
|
||||||
volumes:
|
volumes:
|
||||||
- mongo:/data/db
|
- mongo:/data/db
|
||||||
|
@ -67,7 +66,7 @@ services:
|
||||||
command: >
|
command: >
|
||||||
bash -c
|
bash -c
|
||||||
"for i in `seq 1 30`; do
|
"for i in `seq 1 30`; do
|
||||||
mongo mongo/rocketchat --eval \"
|
mongo db/rocketchat --eval \"
|
||||||
rs.initiate({
|
rs.initiate({
|
||||||
_id: 'rs0',
|
_id: 'rs0',
|
||||||
members: [ { _id: 0, host: 'localhost:27017' } ]})\" &&
|
members: [ { _id: 0, host: 'localhost:27017' } ]})\" &&
|
||||||
|
@ -76,7 +75,7 @@ services:
|
||||||
sleep 5;
|
sleep 5;
|
||||||
done; (exit $$s)"
|
done; (exit $$s)"
|
||||||
depends_on:
|
depends_on:
|
||||||
- mongo
|
- db
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
|
|
||||||
|
|
Reference in New Issue