From 07b21ea2636f8d61185c85138addea71e907548f Mon Sep 17 00:00:00 2001 From: Jarno Rantanen Date: Mon, 26 Nov 2018 22:28:05 +0200 Subject: [PATCH] Rename BACKUP_BUCKET_NAME to AWS_S3_BUCKET_NAME. --- backup.sh | 4 ++-- entrypoint.sh | 2 +- test/kitchen-sink/docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backup.sh b/backup.sh index d4337b3..72b8be3 100755 --- a/backup.sh +++ b/backup.sh @@ -52,10 +52,10 @@ sleep "$BACKUP_WAIT_SECONDS" TIME_UPLOAD="0" TIME_UPLOADED="0" -if [ ! -z "$BACKUP_BUCKET_NAME" ]; then +if [ ! -z "$AWS_S3_BUCKET_NAME" ]; then info "Uploading backup" TIME_UPLOAD="$(date +%s.%N)" - aws s3 cp --only-show-errors "$BACKUP_FILENAME" "s3://$BACKUP_BUCKET_NAME/" + aws s3 cp --only-show-errors "$BACKUP_FILENAME" "s3://$AWS_S3_BUCKET_NAME/" echo "Upload finished" TIME_UPLOADED="$(date +%s.%N)" fi diff --git a/entrypoint.sh b/entrypoint.sh index f04865d..83c5346 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -7,7 +7,7 @@ set -e cat < env.sh BACKUP_SOURCES="${BACKUP_SOURCES:-/backup}" BACKUP_CRON_EXPRESSION="${BACKUP_CRON_EXPRESSION:-@daily}" -BACKUP_BUCKET_NAME="${BACKUP_BUCKET_NAME:-}" +AWS_S3_BUCKET_NAME="${AWS_S3_BUCKET_NAME:-}" BACKUP_FILENAME="$(date +"${BACKUP_FILENAME:-backup-%F.tar.gz}")" BACKUP_ARCHIVE="${BACKUP_ARCHIVE}" BACKUP_WAIT_SECONDS="${BACKUP_WAIT_SECONDS:-0}" diff --git a/test/kitchen-sink/docker-compose.yml b/test/kitchen-sink/docker-compose.yml index e0ca44e..c7c9fce 100644 --- a/test/kitchen-sink/docker-compose.yml +++ b/test/kitchen-sink/docker-compose.yml @@ -27,7 +27,7 @@ services: BACKUP_CRON_EXPRESSION: "* * * * *" BACKUP_FILENAME: "backup-%Y-%m-%d-%H-%M-%S.tar.gz" BACKUP_WAIT_SECONDS: 0 - BACKUP_BUCKET_NAME: docker-volume-backup-companion-test + AWS_S3_BUCKET_NAME: docker-volume-backup-companion-test AWS_ACCESS_KEY_ID: "${AWS_ACCESS_KEY_ID}" AWS_SECRET_ACCESS_KEY: "${AWS_SECRET_ACCESS_KEY}" AWS_DEFAULT_REGION: "${AWS_DEFAULT_REGION}"