bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change compose layout to use env file

Browse Source
This commit is contained in:
sebivh
2025-11-25 15:42:47 +01:00
parent 7613f3a547
commit dac53d2d06
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,4 +1,4 @@
.env/* .env*
*.pyc *.pyc
*_design1 *_design1
fet2020/.env/* fet2020/.env/*

30
docker-compose.yml
View File

@@ -18,15 +18,15 @@ services:
container_name: django-container container_name: django-container
image: django-image:latest image: django-image:latest
environment: environment:
HOST_NAME: "fet.at" HOST_NAME: ${HOSTNAME}
DEBUG: "False" DEBUG: ${DEBUG}
LDAP: "True" LDAP: ${LDAP}
SECRET_KEY: "sae34sADfrFr89E!Gl#f!34hdjGR#!jopi4qFEr#4R56rT56zT2#wE1!feGp" SECRET_KEY: ${SECRET_KEY}
MYSQL_USER: "user" MYSQL_USER: ${DJANGO_MYSQL_USER}
MYSQL_PASSWORD: "hgu" MYSQL_PASSWORD: ${DJANGO_MYSQL_PASSWORD}
ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3" ETHERPAD_GROUP: ${ETHERPAD_GROUP}
EMAIL_HOST_USER: "verleih@fet.at" EMAIL_HOST_USER: ${EMAIL_HOST_USER}
EMAIL_HOST_PASSWORD: "" EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
depends_on: depends_on:
mysql: mysql:
condition: service_healthy condition: service_healthy
@@ -55,8 +55,8 @@ services:
DB_HOST: etherpadsql DB_HOST: etherpadsql
DB_PORT: 3306 DB_PORT: 3306
DB_NAME: etherpaddb DB_NAME: etherpaddb
DB_USER: user DB_USER: ${ETHERPAD_DB_USER}
DB_PASS: "hgu" DB_PASS: ${ETHERPAD_DB_PASSWORD}
DB_CHARSET: "utf8mb4" DB_CHARSET: "utf8mb4"
TRUST_PROXY: false TRUST_PROXY: false
AUTHENTICATION_METHOD: "apikey" AUTHENTICATION_METHOD: "apikey"
@@ -79,8 +79,8 @@ services:
image: mariadb:10.7 image: mariadb:10.7
environment: environment:
MYSQL_DATABASE: fet2020db MYSQL_DATABASE: fet2020db
MYSQL_USER: user MYSQL_USER: ${DJANGO_MYSQL_USER}
MYSQL_PASSWORD: hgu MYSQL_PASSWORD: ${DJANGO_MYSQL_PASSWORD}
MYSQL_COLLATION: utf8_general_ci MYSQL_COLLATION: utf8_general_ci
MYSQL_CHARSET: utf8 MYSQL_CHARSET: utf8
MYSQL_ALLOW_EMPTY_PASSWORD: "yes" MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
@@ -98,8 +98,8 @@ services:
image: mariadb:10.7 image: mariadb:10.7
environment: environment:
MYSQL_DATABASE: etherpaddb MYSQL_DATABASE: etherpaddb
MYSQL_USER: user MYSQL_USER: ${ETHERPAD_DB_USER}
MYSQL_PASSWORD: "hgu" MYSQL_PASSWORD: ${ETHERPAD_DB_PASSWORD}
MYSQL_COLLATION: utf8_general_ci MYSQL_COLLATION: utf8_general_ci
MYSQL_CHARSET: utf8 MYSQL_CHARSET: utf8
MYSQL_ALLOW_EMPTY_PASSWORD: "yes" MYSQL_ALLOW_EMPTY_PASSWORD: "yes"