forked from coop-cloud/hedgedoc
Compare commits
16 Commits
1a2b3b9899
...
d299d5461d
Author | SHA1 | Date |
---|---|---|
Chris Thompson | d299d5461d | |
Chris Thompson | 7159b36272 | |
Chris Thompson | 317e6517a8 | |
Chris Thompson | e53e97e8d9 | |
Chris Thompson | 398c254b89 | |
Chris Thompson | 01a360cf60 | |
Chris Thompson | a3fecc1e36 | |
Chris Thompson | f543dfab04 | |
Moritz | 4846a09169 | |
knoflook | 210a37cd0c | |
3wc | 914ef6b026 | |
mayel | 5f205c149f | |
mayel | d2c8993fcc | |
mayel | 1c93adcf21 | |
mayel | 7970e7c61e | |
mayel | e14f050ede |
|
@ -1,4 +1,6 @@
|
|||
TYPE=hedgedoc
|
||||
TIMEOUT=300
|
||||
ENABLE_AUTO_UPDATE=true
|
||||
|
||||
DOMAIN=hedgedoc.example.com
|
||||
## Domain aliases
|
||||
|
@ -6,7 +8,7 @@ DOMAIN=hedgedoc.example.com
|
|||
LETS_ENCRYPT_ENV=production
|
||||
|
||||
SECRET_DB_PASSWORD_VERSION=v1
|
||||
|
||||
SECRET_CMD_SESSION_SECRET=v1
|
||||
COMPOSE_FILE="compose.yml"
|
||||
|
||||
# OAuth, see https://docs.hedgedoc.org/guides/auth/keycloak/
|
||||
|
@ -40,6 +42,7 @@ COMPOSE_FILE="compose.yml"
|
|||
# CMD_CSP_REPORTURI=undefined
|
||||
# CMD_DEFAULT_PERMISSION=editable
|
||||
# CMD_EMAIL=true
|
||||
# CMD_REQUIRE_FREEURL_AUTHENTICATION=false
|
||||
# CMD_SESSION_LIFE=1209600000
|
||||
# Only present in config.json (no equivalent env var):
|
||||
# DOCUMENT_MAX_LENGTH=100000
|
||||
|
|
10
README.md
10
README.md
|
@ -7,9 +7,9 @@
|
|||
<!-- metadata -->
|
||||
* **Category**: Apps
|
||||
* **Status**: 2, beta
|
||||
* **Image**: [`quay.io/hedgedoc/hedgedoc:1.8.2`](https://quay.io/hedgedoc/hedgedoc:1.8.2), 4, upstream
|
||||
* **Image**: [`quay.io/hedgedoc/hedgedoc`](https://quay.io/hedgedoc/hedgedoc), 4, upstream
|
||||
* **Healthcheck**: Yes
|
||||
* **Backups**: No
|
||||
* **Backups**: Yes
|
||||
* **Email**: No
|
||||
* **Tests**: 2
|
||||
* **SSO**: 3 (OAuth)
|
||||
|
@ -19,14 +19,14 @@
|
|||
|
||||
1. Set up Docker Swarm and [`abra`][abra]
|
||||
2. Deploy [`coop-cloud/traefik`][compose-traefik]
|
||||
3. `abra app new hedegedoc`
|
||||
3. `abra app new hedgedoc`
|
||||
4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
|
||||
your Docker swarm box
|
||||
5. `abra app deploy YOURAPPDOMAIN`
|
||||
6. Create initial user:
|
||||
```
|
||||
abra app YOURAPPDOMAIN run app bash
|
||||
. /docker-entrypoint2.sh -e
|
||||
abra app run YOURAPPDOMAIN app bash
|
||||
. /docker-entrypoint.sh -e
|
||||
bin/manage_users
|
||||
|
||||
[hedegedoc]: https://github.com/hedgedoc/hedgedoc
|
||||
|
|
14
abra.sh
14
abra.sh
|
@ -1,13 +1 @@
|
|||
export ENTRYPOINT_CONF_VERSION=v6
|
||||
|
||||
abra_backup_app() {
|
||||
_abra_backup_dir "app:/home/hackmd/app/public/uploads/"
|
||||
}
|
||||
|
||||
abra_backup_db() {
|
||||
_abra_backup_postgres "db" "codimd" "codimd" "db_password"
|
||||
}
|
||||
|
||||
abra_backup() {
|
||||
abra_backup_app && abra_backup_db
|
||||
}
|
||||
export ENTRYPOINT_CONF_VERSION=v9
|
||||
|
|
25
compose.yml
25
compose.yml
|
@ -1,7 +1,7 @@
|
|||
version: "3.8"
|
||||
services:
|
||||
app:
|
||||
image: quay.io/hedgedoc/hedgedoc:1.9.8
|
||||
image: quay.io/hedgedoc/hedgedoc:1.9.9
|
||||
environment:
|
||||
- CMD_USECDN=false
|
||||
- CMD_URL_ADDPORT=false
|
||||
|
@ -25,6 +25,7 @@ services:
|
|||
- CMD_CSP_REPORTURI
|
||||
- CMD_DEFAULT_PERMISSION
|
||||
- CMD_EMAIL
|
||||
- CMD_REQUIRE_FREEURL_AUTHENTICATION
|
||||
- CMD_SESSION_LIFE
|
||||
- DOCUMENT_MAX_LENGTH
|
||||
depends_on:
|
||||
|
@ -33,7 +34,7 @@ services:
|
|||
- proxy
|
||||
- internal
|
||||
volumes:
|
||||
- codimd_uploads:/home/hackmd/app/public/uploads
|
||||
- codimd_uploads:/hedgedoc/public/uploads
|
||||
secrets:
|
||||
- db_password
|
||||
entrypoint: /docker-entrypoint.sh
|
||||
|
@ -43,7 +44,6 @@ services:
|
|||
mode: 0555
|
||||
- source: config_json
|
||||
target: /files/config.json
|
||||
mode: 0555
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
|
@ -57,6 +57,9 @@ 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}"
|
||||
- "backupbot.backup=true"
|
||||
- "backupbot.backup.path=/hedgedoc/public/uploads"
|
||||
- coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}
|
||||
- coop-cloud.${STACK_NAME}.version=0.5.1+1.9.8
|
||||
healthcheck:
|
||||
test: "nodejs -e \"http.get('http://localhost:3000', (res) => { console.log('status: ', res.statusCode); if (res.statusCode == 200) { process.exit(0); } else { process.exit(1); } });\""
|
||||
|
@ -78,10 +81,18 @@ services:
|
|||
- internal
|
||||
deploy:
|
||||
labels:
|
||||
backupbot.backup: "true"
|
||||
backupbot.backup.pre-hook: "mkdir -p /tmp/backup/ && PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup/backup.sql"
|
||||
backupbot.backup.post-hook: "rm -rf /tmp/backup"
|
||||
backupbot.backup.path: "/tmp/backup/"
|
||||
backupbot.backup: "true"
|
||||
backupbot.backup.pre-hook: "mkdir -p /tmp/backup/ && PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup/backup.sql"
|
||||
backupbot.backup.post-hook: "rm -rf /tmp/backup"
|
||||
backupbot.backup.path: "/tmp/backup/"
|
||||
backupbot.restore: "true"
|
||||
backupbot.restore.post-hook: "sh -c 'psql -U $${POSTGRES_USER} -d $${POSTGRES_DB} < ./backup.sql && rm -f ./backup.sql'"
|
||||
healthcheck:
|
||||
test: "pg_isready"
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 5
|
||||
start_period: 1m
|
||||
volumes:
|
||||
postgres:
|
||||
codimd_uploads:
|
||||
|
|
|
@ -30,6 +30,7 @@ main() {
|
|||
set -eu
|
||||
|
||||
load_vars
|
||||
mkdir "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm" && chmod "u+rwx" "/hedgedoc/.npm"
|
||||
}
|
||||
|
||||
main
|
||||
|
@ -40,6 +41,7 @@ export CMD_DB_URL=postgres://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST:5432/$CM
|
|||
if [ ! "${1-}" == "-e" ]; then
|
||||
# 3wc: upstream ENTRYPOINT
|
||||
# https://github.com/hedgedoc/container/blob/master/alpine/Dockerfile
|
||||
mkdir -p "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm"
|
||||
/usr/local/bin/docker-entrypoint.sh npm start
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in New Issue