New version, sync labels

Reviewed-on: coop-cloud/codimd#7

.drone.yml

@@ -6,17 +6,27 @@ steps:
     image: decentral1se/stack-ssh-deploy:latest
     settings:
       host: swarm-test.autonomic.zone
-      stack: codimd
+      stack: hedgedoc
       deploy_key:
         from_secret: drone_ssh_swarm_test
       generate_secrets: true
       purge: true
     environment:
-      DOMAIN: codimd.swarm-test.autonomic.zone
-      STACK_NAME: codimd
+      DOMAIN: hedgedoc.swarm-test.autonomic.zone
+      STACK_NAME: hedgedoc
       LETS_ENCRYPT_ENV: production
       SECRET_DB_PASSWORD_VERSION: v1
       ENTRYPOINT_CONF_VERSION: v1
 trigger:
   branch:
     - main
+---
+kind: pipeline
+name: recipe release
+steps:
+  - name: release a new version
+    image: thecoopcloud/drone-abra:latest
+    settings:
+      command: recipe hedgedoc release
+      deploy_key:
+        from_secret: abra_bot_deploy_key

.env.sample

@@ -7,14 +7,36 @@ LETS_ENCRYPT_ENV=production
 
 SECRET_DB_PASSWORD_VERSION=v1
 
+COMPOSE_FILE="compose.yml"
+
 # OAuth, see https://hackmd.io/@codimd/codimd-generic-oauth-2
 
-#COMPOSE_FILE="compose.yml:compose.oauth.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.oauth.yml"
 #CMD_OAUTH2_PROVIDERNAME="Keycloak"
 #CMD_OAUTH2_BASEURL="https://keycloak.example.com/realms/realmname/protocol/openid-connect/"
 #CMD_OAUTH2_CLIENT_ID="codimd"
 #CMD_OAUTH2_AUTHORIZATION_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/auth"
 #CMD_OAUTH2_TOKEN_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/token"
 #CMD_OAUTH2_USER_PROFILE_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/userinfo"
+#CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR=ocs.data.id
+#CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR=ocs.data.display-name
+#CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR=ocs.data.email
 #
 #SECRET_OAUTH_KEY_VERSION=v1
+
+# Options, see https://docs.hedgedoc.org/configuration/
+
+# CMD_ALLOW_ANONYMOUS=true
+# CMD_ALLOW_ANONYMOUS_EDITS=false
+# CMD_ALLOW_EMAIL_REGISTER=true
+# CMD_ALLOW_FREEURL=false
+# CMD_ALLOW_GRAVATAR=true
+# CMD_ALLOW_ORIGIN=localhost
+# CMD_COOKIE_POLICY=lax
+# CMD_CSP_ADD_DISQUS=false
+# CMD_CSP_ADD_GOOGLE_ANALYTICS=false
+# CMD_CSP_ENABLE=true
+# CMD_CSP_REPORTURI=undefined
+# CMD_DEFAULT_PERMISSION=editable
+# CMD_EMAIL=true
+# CMD_SESSION_LIFE=1209600000

README.md

@@ -1,13 +1,13 @@
-# CodiMD
+# Hedgedoc
 
-[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/codimd/status.svg)](https://drone.autonomic.zone/coop-cloud/codimd)
+[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/hedegedoc/status.svg)](https://drone.autonomic.zone/coop-cloud/hedegedoc)
 
-[CodiMD][codimd] using Coöp Cloud ♥
+[Hedgedoc][hedegedoc] using Coöp Cloud ♥
 
 <!-- metadata -->
 * **Category**: Apps
 * **Status**: ❷💛
-* **Image**: [`hackmdio/hackmd`](https://hub.docker.com/r/hackmdio/hackmd/), ❶💚, upstream
+* **Image**: [`quay.io/hedgedoc/hedgedoc:1.8.2`](https://quay.io/hedgedoc/hedgedoc:1.8.2), ❶💚, upstream
 * **Healthcheck**: Yes
 * **Backups**: No
 * **Email**: No
@@ -19,17 +19,17 @@
 
 1. Set up Docker Swarm and [`abra`][abra]
 2. Deploy [`coop-cloud/traefik`][compose-traefik]
-3. `abra app new codimd`
+3. `abra app new hedegedoc`
 4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
 5. `abra app YOURAPPDOMAIN deploy`
 6. Create initial user:
 	```
-	abra run YOURAPPDOMAIN app bash
+	abra app YOURAPPDOMAIN run app bash
 	. /docker-entrypoint2.sh -e
 	bin/manage_users
 	```
 
-[codimd]: https://github.com/hackmdio/codimd
+[hedegedoc]: https://github.com/hackmdio/hedegedoc
 [abra]: https://git.autonomic.zone/autonomic-cooperative/abra
 [compose-traefik]: https://git.autonomic.zone/coop-cloud/traefik

abra.sh

@@ -1,4 +1,4 @@
-export ENTRYPOINT_CONF_VERSION=v1
+export ENTRYPOINT_CONF_VERSION=v5
 
 abra_backup_app() {
   _abra_backup_dir "app:/home/hackmd/app/public/uploads/"

compose.oauth.yml

@@ -12,6 +12,8 @@ services:
       - CMD_OAUTH2_TOKEN_URL
       - CMD_OAUTH2_USER_PROFILE_URL
       - CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR
+      - CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR
+      - CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR
     secrets:
       - oauth_key
 

compose.yml

@@ -1,14 +1,31 @@
 version: "3.8"
 services:
   app:
-    image: hackmdio/hackmd:2.3.2
+    image: quay.io/hedgedoc/hedgedoc:1.8.2
     environment:
       - CMD_USECDN=false
+      - CMD_URL_ADDPORT=false
+      - CMD_DOMAIN=$DOMAIN
+      - CMD_PROTOCOL_USESSL=true
+      - CMD_HSTS_ENABLE=false
       - CMD_DB_NAME=codimd
       - CMD_DB_USER=codimd
       - CMD_DB_HOST=db
       - CMD_DB_PASSWORD_FILE=/run/secrets/db_password
-      - CMD_EMAIL # Email login enabled?
+      - CMD_ALLOW_ANONYMOUS
+      - CMD_ALLOW_ANONYMOUS_EDITS
+      - CMD_ALLOW_EMAIL_REGISTER
+      - CMD_ALLOW_FREEURL
+      - CMD_ALLOW_GRAVATAR
+      - CMD_ALLOW_ORIGIN
+      - CMD_COOKIE_POLICY
+      - CMD_CSP_ADD_DISQUS
+      - CMD_CSP_ADD_GOOGLE_ANALYTICS
+      - CMD_CSP_ENABLE
+      - CMD_CSP_REPORTURI
+      - CMD_DEFAULT_PERMISSION
+      - CMD_EMAIL
+      - CMD_SESSION_LIFE
     depends_on:
       - db
     networks:
@@ -36,15 +53,15 @@ 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}"
-        - coop-cloud.${STACK_NAME}.app.version=2.3.2-40b5df94
+        - coop-cloud.${STACK_NAME}.version=0.1.0+1.8.2
     healthcheck:
-      test: ["CMD", "wget", "-qO", "-", "http://localhost:3000"]
+      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
       timeout: 10s
       retries: 10
       start_period: 1m
   db:
-    image: postgres:11.11-alpine
+    image: postgres:11.12-alpine
     environment:
       - POSTGRES_USER=codimd
       - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
@@ -55,8 +72,6 @@ services:
       - db_password
     networks:
       - internal
-    deploy:
-      labels: ['coop-cloud.${STACK_NAME}.db.version=11.11-alpine-5c163653']
 volumes:
   postgres:
   codimd_uploads:

entrypoint.sh.tmpl

@@ -34,13 +34,13 @@ main() {
 
 main
 
-export CMD_DB_URL=postgres://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST/$CMD_DB_NAME
+export CMD_DB_URL=postgres://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST:5432/$CMD_DB_NAME
 
 # 3wc: `source /docker-entrypoint2.sh -e` to load CMD_DB_URL for CLI scripts
 if [ ! "${1-}" == "-e" ]; then
 	# 3wc: upstream ENTRYPOINT
-	# https://github.com/hackmdio/codimd/blob/develop/deployments/Dockerfile
-	/home/hackmd/app/docker-entrypoint.sh
+	# https://github.com/hedgedoc/container/blob/master/alpine/Dockerfile
+	/usr/local/bin/docker-entrypoint.sh npm start
 fi
 
 set +eu