diff --git a/.env.example b/.env.example index cd0895c..4a66936 100644 --- a/.env.example +++ b/.env.example @@ -4,8 +4,10 @@ BACKEND_GIT_BRANCH= FRONTEND_GIT_BRANCH= GIT_TOKEN= -MYSQL_ROOT_PASSWORD= MYSQL_DATABASE= +MYSQL_USER= +MYSQL_PASSWORD= +MYSQL_ROOT_PASSWORD= TYPESENSE_API_KEY= diff --git a/docker-compose.yml b/docker-compose.yml index 52467c3..e7725b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -84,8 +84,9 @@ services: dockerfile: Dockerfile container_name: app-backup environment: - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_DATABASE=${MYSQL_DATABASE} + - MYSQL_USER=${MYSQL_USER} volumes: - ./backups:/backups restart: unless-stopped diff --git a/docker/backup/backup_db.sh b/docker/backup/backup_db.sh index 793c35d..65a7f2f 100755 --- a/docker/backup/backup_db.sh +++ b/docker/backup/backup_db.sh @@ -1,8 +1,5 @@ #!/bin/bash -DB_USER="root" -DB_PASS="root" -DB_NAME="laravel" BACKUP_DIR="/backups" mkdir -p "$BACKUP_DIR" @@ -10,10 +7,10 @@ mkdir -p "$BACKUP_DIR" DAY=$(date +%d) FILE="$BACKUP_DIR/$DAY.sql" -mysqldump -h mariadb -u "$DB_USER" -p"$DB_PASS" "$DB_NAME" > "$FILE" 2>/dev/null +mysqldump -h mariadb -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" > "$FILE" 2>/dev/null if [ $? -eq 0 ]; then - echo "[$(date)] Backup $DB_NAME sauvegardé dans $FILE" >> "$BACKUP_DIR/backup.log" + echo "[$(date)] Backup $MYSQL_DATABASE sauvegardé dans $FILE" >> "$BACKUP_DIR/backup.log" else - echo "[$(date)] ERREUR lors du backup de $DB_NAME" >> "$BACKUP_DIR/backup.log" + echo "[$(date)] ERREUR lors du backup de $MYSQL_DATABASE" >> "$BACKUP_DIR/backup.log" fi \ No newline at end of file diff --git a/docker/backup/entrypoint.sh b/docker/backup/entrypoint.sh index fa52e5b..e3a3255 100755 --- a/docker/backup/entrypoint.sh +++ b/docker/backup/entrypoint.sh @@ -1,2 +1,2 @@ #!/bin/sh -crond -f -l 2 +crond -f -l 2 \ No newline at end of file