Use a unified docker-compose file

This commit is contained in:
erdnaxe 2020-02-02 23:55:37 +01:00
parent 370e8dc871
commit 47b7980502
29 changed files with 354 additions and 525 deletions

View file

@ -1,44 +0,0 @@
# From https://github.com/codimd/container/
version: '3'
services:
database:
# 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
environment:
POSTGRES_USER: codimd
POSTGRES_PASSWORD: codimdpass
POSTGRES_DB: codimd
volumes:
- ./data_db:/var/lib/postgresql/data
restart: always
app:
image: quay.io/codimd/server:1.4.0
environment:
DEBUG: "false"
CMD_DB_URL: "postgres://codimd:codimdpass@database:5432/codimd"
CMD_URL_ADDPORT: "false"
CMD_EMAIL: "false"
CMD_DOMAIN: "${DOMAIN}"
CMD_PROTOCOL_USESSL: "true"
CMD_USECDN: "false"
CMD_ALLOW_FREEURL: "true"
CMD_IMAGE_UPLOAD_TYPE: "filesystem"
CMD_LDAP_URL: "${LDAP_URL}"
CMD_LDAP_BINDDN: "${LDAP_BINDDN}"
CMD_LDAP_BINDCREDENTIALS: "${LDAP_BINDCREDENTIALS}"
CMD_LDAP_SEARCHBASE: "${LDAP_SEARCHBASE}"
CMD_LDAP_SEARCHFILTER: "(uid={{username}})"
CMD_LDAP_SEARCHATTRIBUTES: "uid, givenName, mail"
CMD_LDAP_USERIDFIELD: "uid"
CMD_LDAP_USERNAMEFIELD: "uid"
CMD_LDAP_PROVIDERNAME: "${LDAP_PROVIDERNAME}"
ports:
- "8081:3000"
volumes:
- ./data_uploads:/codimd/public/uploads
restart: always
depends_on:
- database

View file

@ -1,6 +0,0 @@
DOMAIN=codimd.auro.re
LDAP_URL=ldap://10.128.0.11
LDAP_BINDDN=cn=codimd,ou=service-users,dc=auro,dc=re
LDAP_BINDCREDENTIALS=Change me
LDAP_SEARCHBASE=cn=Utilisateurs,dc=auro,dc=re
LDAP_PROVIDERNAME=Aurore