From 3a6b0aa8dac98cac70bb94fc582699c8df8fca49 Mon Sep 17 00:00:00 2001 From: Elian Loraux <elian.loraux@tetras-libre.fr> Date: Wed, 29 May 2024 11:44:18 +0200 Subject: [PATCH] set .env variable to database credentials --- .env.sample | 3 +++ docker-compose.yml | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.env.sample b/.env.sample index f1b37e6..cf12756 100644 --- a/.env.sample +++ b/.env.sample @@ -3,3 +3,6 @@ COMPOSE_FILE=docker-compose.yml:traefik.yml HOST=passbolt.DOMAINE.FR NAME=passbolt + +MYSQL_USER= +MYSQL_PASSWORD= diff --git a/docker-compose.yml b/docker-compose.yml index d0d4738..ff6936c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,8 +6,8 @@ services: environment: MYSQL_RANDOM_ROOT_PASSWORD: "true" MYSQL_DATABASE: "passbolt" - MYSQL_USER: "passbolt" - MYSQL_PASSWORD: "P4ssb0lt" + MYSQL_USER: ${MYSQL_USER} + MYSQL_PASSWORD: ${MYSQL_PASSWORD} volumes: - database_volume:/var/lib/mysql @@ -19,11 +19,11 @@ services: depends_on: - db environment: - APP_FULL_BASE_URL: http://localhost + APP_FULL_BASE_URL: http://${HOST} DATASOURCES_DEFAULT_HOST: "db" - DATASOURCES_DEFAULT_USERNAME: "passbolt" - DATASOURCES_DEFAULT_PASSWORD: "P4ssb0lt" DATASOURCES_DEFAULT_DATABASE: "passbolt" + DATASOURCES_DEFAULT_USERNAME: ${MYSQL_USER} + DATASOURCES_DEFAULT_PASSWORD: ${MYSQL_PASSWORD} volumes: - gpg_volume:/etc/passbolt/gpg - jwt_volume:/etc/passbolt/jwt -- GitLab