From 70ee06885e2dc4e7ebae091c3197ff4804acf2d2 Mon Sep 17 00:00:00 2001 From: Giovanni-Josserand Date: Sat, 28 Mar 2026 11:07:40 +0100 Subject: [PATCH] make that php, mariadb and backup containers use the same env variables about database --- docker-compose.yml | 16 +++++++++++----- docker/backup/backup_db.sh | 6 +++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index afdd0bb..2ff6014 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,8 @@ services: image: mariadb:latest container_name: app-mariadb environment: - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - - MYSQL_DATABASE=${MYSQL_DATABASE} + - DB_ROOT_PASSWORD=${DB_ROOT_PASSWORD} + - DB_DATABASE=${DB_DATABASE} ports: - "3306:3306" volumes: @@ -30,6 +30,12 @@ services: - BACKEND_GIT_REPO=${BACKEND_GIT_REPO} - BACKEND_GIT_BRANCH=${BACKEND_GIT_BRANCH} - DEV=${DEV} + - DB_CONNECTION=${DB_CONNECTION} + - DB_HOST=${DB_HOST} + - DB_PORT=${DB_PORT} + - DB_DATABASE=${DB_DATABASE} + - DB_USERNAME=${DB_USERNAME} + - DB_PASSWORD=${DB_PASSWORD} depends_on: - mariadb - typesense @@ -96,9 +102,9 @@ services: dockerfile: Dockerfile container_name: app-backup environment: - - MYSQL_PASSWORD=${MYSQL_PASSWORD} - - MYSQL_DATABASE=${MYSQL_DATABASE} - - MYSQL_USER=${MYSQL_USER} + - DB_PASSWORD=${DB_PASSWORD} + - DB_DATABASE=${DB_DATABASE} + - DB_USERNAME=${DB_USERNAME} volumes: - ./backups:/backups restart: unless-stopped diff --git a/docker/backup/backup_db.sh b/docker/backup/backup_db.sh index 65a7f2f..eaf1326 100755 --- a/docker/backup/backup_db.sh +++ b/docker/backup/backup_db.sh @@ -7,10 +7,10 @@ mkdir -p "$BACKUP_DIR" DAY=$(date +%d) FILE="$BACKUP_DIR/$DAY.sql" -mysqldump -h mariadb -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" > "$FILE" 2>/dev/null +mysqldump -h mariadb -u "$DB_USERNAME" -p"$DB_PASSWORD" "$DB_DATABASE" > "$FILE" 2>/dev/null if [ $? -eq 0 ]; then - echo "[$(date)] Backup $MYSQL_DATABASE sauvegardé dans $FILE" >> "$BACKUP_DIR/backup.log" + echo "[$(date)] Backup $DB_DATABASE sauvegardé dans $FILE" >> "$BACKUP_DIR/backup.log" else - echo "[$(date)] ERREUR lors du backup de $MYSQL_DATABASE" >> "$BACKUP_DIR/backup.log" + echo "[$(date)] ERREUR lors du backup de $DB_DATABASE" >> "$BACKUP_DIR/backup.log" fi \ No newline at end of file