From 6029f5b9f3f580955dd92f1f4ebed729f9ef1c49 Mon Sep 17 00:00:00 2001 From: lanjelot Date: Mon, 21 Dec 2020 01:52:30 +1100 Subject: [PATCH 1/2] use hedgedoc image and fix issues with non default CMD_DOMAIN --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 48ed357..da40dcd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,10 +22,10 @@ services: hedgedoc: - image: quay.io/codimd/server:1.6.0 + image: quay.io/hedgedoc/hedgedoc:1.6.0 environment: - CMD_DB_URL=postgres://ctfpad:tookahlaiphee2KieTeeg5ooxutang4o@db:5432/ctfpad # Change here - - CMD_DOMAIN=my.domain.com # Change here + - CMD_DOMAIN=localhost # Change here - CMD_PORT=3000 # Change here - CMD_COOKIE_POLICY=none - CMD_ALLOW_ANONYMOUS=false @@ -43,7 +43,7 @@ services: build: https://github.com/hugsy/ctfpad.git#master command: python manage.py runserver 0.0.0.0:8000 environment: - - HEDGEDOC_URL=http://localhost:3000 # Change here to your server public IP / FQDN + - HEDGEDOC_URL=http://hedgedoc:3000 # Change here to your server public IP / FQDN - CTFPAD_HOSTNAME=localhost # Change here to your server public IP / FQDN - CTFPAD_DB_NAME=ctfpad # (opt.) Change here - CTFPAD_DB_USER=ctfpad # (opt.) Change here From 4ca0053a312d66dace197d546ee5b61afd70c642 Mon Sep 17 00:00:00 2001 From: lanjelot Date: Tue, 22 Dec 2020 18:11:52 +1100 Subject: [PATCH 2/2] fix hedgedoc hostname must be localhost in docker-compose --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index da40dcd..533c374 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,7 @@ services: build: https://github.com/hugsy/ctfpad.git#master command: python manage.py runserver 0.0.0.0:8000 environment: - - HEDGEDOC_URL=http://hedgedoc:3000 # Change here to your server public IP / FQDN + - HEDGEDOC_URL=http://localhost:3000 # Change here to your server public IP / FQDN - CTFPAD_HOSTNAME=localhost # Change here to your server public IP / FQDN - CTFPAD_DB_NAME=ctfpad # (opt.) Change here - CTFPAD_DB_USER=ctfpad # (opt.) Change here