Compare commits
24 Commits
0.5.0+1.9.
...
main
Author | SHA1 | Date |
---|---|---|
Moritz | 65ec56ac08 | |
Moritz | e8f1186965 | |
Moritz | 66c5160812 | |
trav | c656afb176 | |
Cassowary | 97f2d94079 | |
Moritz | 4846a09169 | |
knoflook | 210a37cd0c | |
3wc | 914ef6b026 | |
mayel | 5f205c149f | |
mayel | d2c8993fcc | |
mayel | 1c93adcf21 | |
mayel | 7970e7c61e | |
mayel | e14f050ede | |
3wc | 5fd556d358 | |
3wc | 4c2417901e | |
3wc | 6bc2679dee | |
3wc | d2d5b8ceb1 | |
3wc | afd3b03b21 | |
decentral1se | b43724ecba | |
Chris Thompson | 8e973cbed1 | |
Chris Thompson | 7780eb9f13 | |
Chris Thompson | 9e88945b9b | |
Chris Thompson | 6139cff626 | |
Chris Thompson | 0c96d5a45f |
20
.drone.yml
20
.drone.yml
|
@ -3,10 +3,12 @@ kind: pipeline
|
||||||
name: deploy to swarm-test.autonomic.zone
|
name: deploy to swarm-test.autonomic.zone
|
||||||
steps:
|
steps:
|
||||||
- name: deployment
|
- name: deployment
|
||||||
image: decentral1se/stack-ssh-deploy:latest
|
image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
|
||||||
settings:
|
settings:
|
||||||
host: swarm-test.autonomic.zone
|
host: swarm-test.autonomic.zone
|
||||||
stack: hedgedoc
|
stack: hedgedoc
|
||||||
|
networks:
|
||||||
|
- proxy
|
||||||
deploy_key:
|
deploy_key:
|
||||||
from_secret: drone_ssh_swarm_test
|
from_secret: drone_ssh_swarm_test
|
||||||
generate_secrets: true
|
generate_secrets: true
|
||||||
|
@ -22,11 +24,17 @@ trigger:
|
||||||
- main
|
- main
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: recipe release
|
name: generate recipe catalogue
|
||||||
steps:
|
steps:
|
||||||
- name: release a new version
|
- name: release a new version
|
||||||
image: thecoopcloud/drone-abra:latest
|
image: plugins/downstream
|
||||||
settings:
|
settings:
|
||||||
command: recipe hedgedoc release
|
server: https://build.coopcloud.tech
|
||||||
deploy_key:
|
token:
|
||||||
from_secret: abra_bot_deploy_key
|
from_secret: drone_abra-bot_token
|
||||||
|
fork: true
|
||||||
|
repositories:
|
||||||
|
- coop-cloud/auto-recipes-catalogue-json
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
event: tag
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
TYPE=hedgedoc
|
TYPE=hedgedoc
|
||||||
|
TIMEOUT=300
|
||||||
|
ENABLE_AUTO_UPDATE=true
|
||||||
|
|
||||||
DOMAIN=hedgedoc.example.com
|
DOMAIN=hedgedoc.example.com
|
||||||
## Domain aliases
|
## Domain aliases
|
||||||
|
@ -41,3 +43,5 @@ COMPOSE_FILE="compose.yml"
|
||||||
# CMD_DEFAULT_PERMISSION=editable
|
# CMD_DEFAULT_PERMISSION=editable
|
||||||
# CMD_EMAIL=true
|
# CMD_EMAIL=true
|
||||||
# CMD_SESSION_LIFE=1209600000
|
# CMD_SESSION_LIFE=1209600000
|
||||||
|
# Only present in config.json (no equivalent env var):
|
||||||
|
# DOCUMENT_MAX_LENGTH=100000
|
||||||
|
|
15
README.md
15
README.md
|
@ -7,9 +7,9 @@
|
||||||
<!-- metadata -->
|
<!-- metadata -->
|
||||||
* **Category**: Apps
|
* **Category**: Apps
|
||||||
* **Status**: 2, beta
|
* **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
|
* **Healthcheck**: Yes
|
||||||
* **Backups**: No
|
* **Backups**: Yes
|
||||||
* **Email**: No
|
* **Email**: No
|
||||||
* **Tests**: 2
|
* **Tests**: 2
|
||||||
* **SSO**: 3 (OAuth)
|
* **SSO**: 3 (OAuth)
|
||||||
|
@ -19,17 +19,16 @@
|
||||||
|
|
||||||
1. Set up Docker Swarm and [`abra`][abra]
|
1. Set up Docker Swarm and [`abra`][abra]
|
||||||
2. Deploy [`coop-cloud/traefik`][compose-traefik]
|
2. Deploy [`coop-cloud/traefik`][compose-traefik]
|
||||||
3. `abra app new hedegedoc`
|
3. `abra app new hedgedoc`
|
||||||
4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
|
4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
|
||||||
your Docker swarm box
|
your Docker swarm box
|
||||||
5. `abra app YOURAPPDOMAIN deploy`
|
5. `abra app deploy YOURAPPDOMAIN`
|
||||||
6. Create initial user:
|
6. Create initial user:
|
||||||
```
|
```
|
||||||
abra app YOURAPPDOMAIN run app bash
|
abra app YOURAPPDOMAIN run app bash
|
||||||
. /docker-entrypoint2.sh -e
|
. /docker-entrypoint2.sh -e
|
||||||
bin/manage_users
|
bin/manage_users
|
||||||
```
|
|
||||||
|
|
||||||
[hedegedoc]: https://github.com/hackmdio/hedegedoc
|
[hedegedoc]: https://github.com/hedgedoc/hedgedoc
|
||||||
[abra]: https://git.autonomic.zone/autonomic-cooperative/abra
|
[abra]: https://git.autonomic.zone/autonomic-cooperative/abra
|
||||||
[compose-traefik]: https://git.autonomic.zone/coop-cloud/traefik
|
[compose-traefik]: https://git.autonomic.zone/coop-cloud/traefik
|
2
abra.sh
2
abra.sh
|
@ -1,4 +1,4 @@
|
||||||
export ENTRYPOINT_CONF_VERSION=v5
|
export ENTRYPOINT_CONF_VERSION=v8
|
||||||
|
|
||||||
abra_backup_app() {
|
abra_backup_app() {
|
||||||
_abra_backup_dir "app:/home/hackmd/app/public/uploads/"
|
_abra_backup_dir "app:/home/hackmd/app/public/uploads/"
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
authentik:
|
||||||
|
env:
|
||||||
|
CMD_OAUTH2_USER_PROFILE_URL: https://authentik.example.com/application/o/userinfo/
|
||||||
|
CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR: preferred_username
|
||||||
|
CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR: name
|
||||||
|
CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR: email
|
||||||
|
CMD_OAUTH2_TOKEN_URL: https://authentik.example.com/application/o/token/
|
||||||
|
CMD_OAUTH2_AUTHORIZATION_URL: https://authentik.example.com/application/o/authorize/
|
||||||
|
CMD_OAUTH2_CLIENT_ID: hedgedoc
|
||||||
|
CMD_OAUTH2_PROVIDERNAME: Authentik
|
||||||
|
uncomment:
|
||||||
|
- compose.oauth.yml
|
||||||
|
- SECRET_OAUTH_KEY_VERSION
|
||||||
|
shared_secrets:
|
||||||
|
hedgedoc_secret: oauth_key
|
23
compose.yml
23
compose.yml
|
@ -1,7 +1,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: quay.io/hedgedoc/hedgedoc:1.9.6
|
image: quay.io/hedgedoc/hedgedoc:1.9.9
|
||||||
environment:
|
environment:
|
||||||
- CMD_USECDN=false
|
- CMD_USECDN=false
|
||||||
- CMD_URL_ADDPORT=false
|
- CMD_URL_ADDPORT=false
|
||||||
|
@ -26,6 +26,7 @@ services:
|
||||||
- CMD_DEFAULT_PERMISSION
|
- CMD_DEFAULT_PERMISSION
|
||||||
- CMD_EMAIL
|
- CMD_EMAIL
|
||||||
- CMD_SESSION_LIFE
|
- CMD_SESSION_LIFE
|
||||||
|
- DOCUMENT_MAX_LENGTH
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
networks:
|
networks:
|
||||||
|
@ -40,6 +41,9 @@ services:
|
||||||
- source: entrypoint_conf
|
- source: entrypoint_conf
|
||||||
target: /docker-entrypoint.sh
|
target: /docker-entrypoint.sh
|
||||||
mode: 0555
|
mode: 0555
|
||||||
|
- source: config_json
|
||||||
|
target: /files/config.json
|
||||||
|
mode: 0555
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
|
@ -53,7 +57,8 @@ services:
|
||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
- "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.SSLForceHost=true"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
- coop-cloud.${STACK_NAME}.version=0.5.0+1.9.6
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
|
- "coop-cloud.${STACK_NAME}.version=1.0.1+1.9.9"
|
||||||
healthcheck:
|
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); } });\""
|
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); } });\""
|
||||||
interval: 30s
|
interval: 30s
|
||||||
|
@ -61,7 +66,7 @@ services:
|
||||||
retries: 10
|
retries: 10
|
||||||
start_period: 1m
|
start_period: 1m
|
||||||
db:
|
db:
|
||||||
image: postgres:11.18-alpine
|
image: postgres:16.1-alpine
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_USER=codimd
|
- POSTGRES_USER=codimd
|
||||||
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
||||||
|
@ -75,9 +80,11 @@ services:
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
backupbot.backup: "true"
|
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.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
|
||||||
backupbot.backup.post-hook: "rm -rf /tmp/backup"
|
backupbot.backup.post-hook: "rm -f /var/lib/postgresql/data/backup.sql"
|
||||||
backupbot.backup.path: "/tmp/backup/"
|
backupbot.backup.path: "/var/lib/postgresql/data/backup.sql"
|
||||||
|
backupbot.restore: "true"
|
||||||
|
backupbot.restore.post-hook: "sh -c 'psql -U $${POSTGRES_USER} -d $${POSTGRES_DB} < /var/lib/postgresql/data/backup.sql && rm -f /var/lib/postgresql/data/backup.sql'"
|
||||||
volumes:
|
volumes:
|
||||||
postgres:
|
postgres:
|
||||||
codimd_uploads:
|
codimd_uploads:
|
||||||
|
@ -90,6 +97,10 @@ networks:
|
||||||
external: true
|
external: true
|
||||||
internal:
|
internal:
|
||||||
configs:
|
configs:
|
||||||
|
config_json:
|
||||||
|
name: ${STACK_NAME}_config_${ENTRYPOINT_CONF_VERSION}
|
||||||
|
file: config.json.tmpl
|
||||||
|
template_driver: golang
|
||||||
entrypoint_conf:
|
entrypoint_conf:
|
||||||
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION}
|
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION}
|
||||||
file: entrypoint.sh.tmpl
|
file: entrypoint.sh.tmpl
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
{{ if (env "DOCUMENT_MAX_LENGTH") }}
|
||||||
|
"production": {
|
||||||
|
"documentMaxLength": {{ env "DOCUMENT_MAX_LENGTH" }}
|
||||||
|
}
|
||||||
|
{{ end }}
|
||||||
|
}
|
|
@ -30,6 +30,7 @@ main() {
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
load_vars
|
load_vars
|
||||||
|
mkdir "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm" && chmod "u+rwx" "/hedgedoc/.npm"
|
||||||
}
|
}
|
||||||
|
|
||||||
main
|
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
|
if [ ! "${1-}" == "-e" ]; then
|
||||||
# 3wc: upstream ENTRYPOINT
|
# 3wc: upstream ENTRYPOINT
|
||||||
# https://github.com/hedgedoc/container/blob/master/alpine/Dockerfile
|
# 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
|
/usr/local/bin/docker-entrypoint.sh npm start
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
WARNING WARNING WARNING 🚨
|
||||||
|
|
||||||
|
This release includes a major Postgres database upgrade, but does not yet include tools to automatically upgrade from older Postgres releases.
|
||||||
|
|
||||||
|
PLEASE DO NOT UPGRADE EXISTING INSTANCES TO THIS VERSION.
|
||||||
|
|
||||||
|
This should be fixed soon.
|
Loading…
Reference in New Issue