From 8732f37d09f005c02bbf622ca976eb9741973ffe Mon Sep 17 00:00:00 2001
From: Jeltz <jeltz@auro.re>
Date: Tue, 21 Dec 2021 13:49:41 +0100
Subject: [PATCH] Use official hedgedoc image

---
 docker-compose.yml  | 13 +++++++++++--
 hedgedoc/Dockerfile | 21 ---------------------
 2 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 hedgedoc/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index fd481b4..c4fdeb6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,11 +10,20 @@ services:
       - 8080:80
 
   hedgedoc:
-    build: hedgedoc
+    image: quay.io/hedgedoc/hedgedoc:1.9.2-alpine
     restart: always
     environment:
+      DEBUG: "false"
+      CMD_EMAIL: "true"
+      CMD_ALLOW_EMAIL_REGISTER: "true"
+      CMD_PROTOCOL_USESSL: "true"
+      CMD_DOMAIN: "codimd.auro.re"
+      CMD_ALLOW_ORIGIN: "['codimd.auro.re','hedgedoc.auro.re']"
+      CMD_CSP_ENABLE: "false"
+      CMD_COOKIE_POLICY: "none"
+      CMD_ALLOW_FREEURL: "true"
+      CMD_USECDN: "false"
       CMD_DB_URL: "${CODIMD_DB_URL}"
-      CMD_LDAP_BINDCREDENTIALS: "${CODIMD_LDAP_BINDCREDENTIALS}"
       CMD_OAUTH2_USER_PROFILE_URL: https://auth.auro.re/auth/realms/aurore/protocol/openid-connect/userinfo
       CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR: preferred_username
       CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR: preferred_username
diff --git a/hedgedoc/Dockerfile b/hedgedoc/Dockerfile
deleted file mode 100644
index 1d2501b..0000000
--- a/hedgedoc/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM quay.io/hedgedoc/hedgedoc:1.9.2-alpine
-
-ENV DEBUG=false
-ENV CMD_EMAIL=true
-ENV CMD_ALLOW_EMAIL_REGISTER=true
-ENV CMD_PROTOCOL_USESSL=true
-ENV CMD_DOMAIN=codimd.auro.re
-#ENV CMD_ALLOW_ORIGIN=['codimd.auro.re','hedgedoc.auro.re']
-#ENV CMD_CSP_ENABLE=false
-#ENV CMD_COOKIE_POLICY=none
-ENV CMD_ALLOW_FREEURL=true
-ENV CMD_LDAP_URL=ldap://10.128.0.149
-ENV CMD_LDAP_BINDDN=cn=codimd,ou=service-users,dc=auro,dc=re
-ENV CMD_LDAP_SEARCHBASE=cn=Utilisateurs,dc=auro,dc=re
-ENV CMD_LDAP_SEARCHFILTER=(uid={{username}})
-ENV CMD_LDAP_SEARCHATTRIBUTES=uid,givenName,mail
-ENV CMD_LDAP_USERIDFIELD=uid
-ENV CMD_LDAP_USERNAMEFIELD=uid
-ENV CMD_LDAP_PROVIDERNAME=Aurore
-ENV CMD_USECDN=false
-ENV CMD_AUTO_VERSION_CHECK=false