3rd attempt at using elabftw secret

This commit is contained in:
Cian Hughes
2024-01-12 18:24:36 +00:00
parent 0b6be53d30
commit cf116669c6
2 changed files with 3 additions and 3 deletions

View File

@@ -91,8 +91,8 @@ services:
MYSQL_USER: "elabftw" MYSQL_USER: "elabftw"
MYSQL_PASSWORD_FILE: /run/secrets/elabftw_sql_key MYSQL_PASSWORD_FILE: /run/secrets/elabftw_sql_key
MYSQL_ROOT_PASSWORD: "test" # MYSQL_RANDOM_ROOT_PASSWORD: 1 MYSQL_ROOT_PASSWORD: "test" # MYSQL_RANDOM_ROOT_PASSWORD: 1
MYSQL_HOST: "172.252.0.15" MYSQL_HOST: "172.252.0.15" # Needs to allow access from the elabftw container
MYSQL_ROOT_HOST: "172.252.0.15" # Must allow root access from any host or won't work on swarm MYSQL_ROOT_HOST: "172.252.0.15"
TZ: "Europe/Paris" TZ: "Europe/Paris"
volumes: volumes:
- stack_elabftw_sql:/var/lib/mysql - stack_elabftw_sql:/var/lib/mysql

View File

@@ -72,7 +72,7 @@ services:
- elabftw_sql_key - elabftw_sql_key
- elabftw_secret_key - elabftw_secret_key
environment: environment:
SECRET_KEY: "$${cat /run/secrets/elabftw_secret_key}" SECRET_KEY: $${cat /run/secrets/elabftw_secret_key}
DB_HOST: "172.252.0.7" DB_HOST: "172.252.0.7"
DB_PORT: "3306" DB_PORT: "3306"
DB_NAME: "elabftw" DB_NAME: "elabftw"