From 54bc599d3cb07b711a9fe16672dc79e49be2f633 Mon Sep 17 00:00:00 2001 From: erdnaxe Date: Mon, 3 Feb 2020 13:12:31 +0100 Subject: [PATCH] CodiMD in global compose --- codimd/Dockerfile | 18 ++++++++++++++++++ docker-compose.yml | 24 ++++++++++++++++++++++++ env.example | 1 + 3 files changed, 43 insertions(+) create mode 100644 codimd/Dockerfile diff --git a/codimd/Dockerfile b/codimd/Dockerfile new file mode 100644 index 0000000..6debbe7 --- /dev/null +++ b/codimd/Dockerfile @@ -0,0 +1,18 @@ +FROM quay.io/codimd/server:1.5.0 + +ENV DEBUG=false +ENV CMD_DB_URL=postgres://codimd:codimdpass@postgres:5432/codimd +ENV CMD_URL_ADDPORT=false +ENV CMD_EMAIL=false +ENV CMD_DOMAIN=codimd.auro.re +ENV CMD_PROTOCOL_USESSL=true +ENV CMD_ALLOW_FREEURL=true +ENV CMD_IMAGE_UPLOAD_TYPE=filesystem +ENV CMD_LDAP_URL=ldap://10.128.0.11 +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 diff --git a/docker-compose.yml b/docker-compose.yml index dd77702..046026b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,3 +53,27 @@ services: restart: always environment: - "DISCORD_WEBHOOK=${PROMETHEUS_DISCORD_WEBHOOK}" + + postgres: + # Don't upgrade PostgreSQL by simply changing the version number + # You need to migrate the Database to the new PostgreSQL version + image: postgres:9.6-alpine + restart: always + environment: + POSTGRES_USER: codimd + POSTGRES_PASSWORD: codimdpass + POSTGRES_DB: codimd + volumes: + - ./postgres_data:/var/lib/postgresql/data + + codimd: + build: codimd + restart: always + environment: + CMD_LDAP_BINDCREDENTIALS: "${CODIMD_LDAP_BINDCREDENTIALS}" + ports: + - "8081:3000" + volumes: + - ./codimd_uploads_data:/codimd/public/uploads + depends_on: + - postgres diff --git a/env.example b/env.example index 17a189c..7ef4d89 100644 --- a/env.example +++ b/env.example @@ -2,3 +2,4 @@ ETHERPAD_POSTGRES_PASSWD=CHANGE ME GRAFANA_LDAP_BIND_PASSWD=CHANGE ME PROMETHEUS_DISCORD_WEBHOOK=CHANGE ME +CODIMD_LDAP_BINDCREDENTIALS=CHANGE ME