diff --git a/.env b/.env index 895577f..1636d67 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -1COMPOSE_PROJECT_NAME=tqo +COMPOSE_PROJECT_NAME=tqo NETWORK=tqo FRONT_TAG=139.2 diff --git a/app.sh b/app.sh index 86c2dea..5d74268 100755 --- a/app.sh +++ b/app.sh @@ -1,8 +1,8 @@ DIRECTORY=`dirname $0` -MYSQL_ROOT_PASSWORD=$(grep MYSQL_ROOT_PASSWORD $DIRECTORY"/.env" | xargs) -MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD#*=} - +#MYSQL_ROOT_PASSWORD=$(grep MYSQL_ROOT_PASSWORD $DIRECTORY"/.env" | xargs) +#MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD#*=} +source $DIRECTORY"/.env" help() { echo "run $0 [COMMAND] " echo ' @@ -48,7 +48,7 @@ log() { ## restore last backup from s3 storage restoredb() { log "run restore database" - sudo rclone copy --verbose selectel:backup_db/dot/dot.$(date +%a).sql.gz backups/ + sudo rclone copy --verbose selectel:backup_db/dot/spottorg/tqo/dot.$(date +%a).sql.gz backups/ zcat backups/dot.$(date +%a).sql.gz | docker compose exec -T db mysql -uroot -p${MYSQL_ROOT_PASSWORD} dot } diff --git a/docker-compose.yml b/docker-compose.yml index a52b203..7488b5c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -232,7 +232,7 @@ services: - dd backupdb: - image: registry.dot-dot.ru/backupdb:master + image: registry.dot-dot.ru/backupdb:v0.0.2 restart: unless-stopped environment: MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}