From 46e30cc9458ec1fc274e9e0a96a4897619ff38a9 Mon Sep 17 00:00:00 2001
From: Jarno Rantanen <jarno@jrw.fi>
Date: Tue, 27 Nov 2018 11:02:20 +0200
Subject: [PATCH] Rename from "docker-volume-backup-companion" to
 "docker-volume-backup".

---
 README.md                                              | 10 +++++-----
 entrypoint.sh                                          |  6 +++---
 test/backing-up-to-s3/docker-compose.yml               |  2 +-
 test/kitchen-sink/docker-compose.yml                   |  6 +++---
 .../docker-compose.yml                                 |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index e6aecd7..f9c9635 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# docker-volume-backup-companion
+# docker-volume-backup
 
 Docker image for performing simple backups of Docker volumes. Main features:
 
@@ -23,7 +23,7 @@ services:
       - grafana-data:/var/lib/grafana           # This is where Grafana keeps its data
 
   backup:
-    image: futurice/docker-volume-backup-companion:TODO
+    image: futurice/docker-volume-backup:TODO
     environment:
       BACKUP_SOURCES: /mnt/grafana              # Where to read data from
       BACKUP_ARCHIVE: /mnt/backups              # Where to write backups to
@@ -51,7 +51,7 @@ services:
       - grafana-data:/var/lib/grafana           # This is where Grafana keeps its data
 
   backup:
-    image: futurice/docker-volume-backup-companion:TODO
+    image: futurice/docker-volume-backup:TODO
     environment:
       BACKUP_SOURCES: /mnt/grafana              # Where to read data from
       AWS_S3_BUCKET_NAME: my-backup-bucket      # S3 bucket which you own, and already exists
@@ -81,10 +81,10 @@ services:
     volumes:
       - grafana-data:/var/lib/grafana           # This is where Grafana keeps its data
     labels:
-      - "docker-volume-backup-companion.stop-during-backup=true"
+      - "docker-volume-backup.stop-during-backup=true"
 
   backup:
-    image: futurice/docker-volume-backup-companion:TODO
+    image: futurice/docker-volume-backup:TODO
     environment:
       BACKUP_SOURCES: /mnt/grafana              # Where to read data from
       AWS_S3_BUCKET_NAME: my-backup-bucket      # S3 bucket which you own, and already exists
diff --git a/entrypoint.sh b/entrypoint.sh
index b33fd98..1bf7e42 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -12,7 +12,7 @@ BACKUP_FILENAME="$(date +"${BACKUP_FILENAME:-backup-%F.tar.gz}")"
 BACKUP_ARCHIVE="${BACKUP_ARCHIVE}"
 BACKUP_WAIT_SECONDS="${BACKUP_WAIT_SECONDS:-0}"
 BACKUP_HOSTNAME="${BACKUP_HOSTNAME:-$(hostname)}"
-DOCKER_STOP_OPT_IN_LABEL="${DOCKER_STOP_OPT_IN_LABEL:-docker-volume-backup-companion.stop-during-backup}"
+DOCKER_STOP_OPT_IN_LABEL="${DOCKER_STOP_OPT_IN_LABEL:-docker-volume-backup.stop-during-backup}"
 INFLUXDB_URL="${INFLUXDB_URL:-}"
 INFLUXDB_DB="${INFLUXDB_DB:-}"
 INFLUXDB_CREDENTIALS="${INFLUXDB_CREDENTIALS:-}"
@@ -36,8 +36,8 @@ EOF
 fi
 
 # Add our cron entry, and direct stdout & stderr to Docker commands stdout
-echo "Installing cron.d entry: docker-volume-backup-companion"
-echo "$BACKUP_CRON_EXPRESSION root /root/backup.sh > /proc/1/fd/1 2>&1" > /etc/cron.d/docker-volume-backup-companion
+echo "Installing cron.d entry: docker-volume-backup"
+echo "$BACKUP_CRON_EXPRESSION root /root/backup.sh > /proc/1/fd/1 2>&1" > /etc/cron.d/docker-volume-backup
 
 # Let cron take the wheel
 echo "Starting cron in foreground with expression: $BACKUP_CRON_EXPRESSION"
diff --git a/test/backing-up-to-s3/docker-compose.yml b/test/backing-up-to-s3/docker-compose.yml
index cf78891..e5e1c5e 100644
--- a/test/backing-up-to-s3/docker-compose.yml
+++ b/test/backing-up-to-s3/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     environment:
       BACKUP_CRON_EXPRESSION: "* * * * *"
       BACKUP_SOURCES: /mnt/grafana
-      AWS_S3_BUCKET_NAME: docker-volume-backup-companion-test
+      AWS_S3_BUCKET_NAME: docker-volume-backup-test
       AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
     volumes:
diff --git a/test/kitchen-sink/docker-compose.yml b/test/kitchen-sink/docker-compose.yml
index c7c9fce..ec3ed66 100644
--- a/test/kitchen-sink/docker-compose.yml
+++ b/test/kitchen-sink/docker-compose.yml
@@ -18,16 +18,16 @@ services:
     volumes:
       - bar-data:/data
     labels:
-      - "docker-volume-backup-companion.stop-during-backup=true"
+      - "docker-volume-backup.stop-during-backup=true"
 
   backup:
     build: .
     environment:
-      BACKUP_HOSTNAME: docker-volume-backup-companion
+      BACKUP_HOSTNAME: docker-volume-backup
       BACKUP_CRON_EXPRESSION: "* * * * *"
       BACKUP_FILENAME: "backup-%Y-%m-%d-%H-%M-%S.tar.gz"
       BACKUP_WAIT_SECONDS: 0
-      AWS_S3_BUCKET_NAME: docker-volume-backup-companion-test
+      AWS_S3_BUCKET_NAME: docker-volume-backup-test
       AWS_ACCESS_KEY_ID: "${AWS_ACCESS_KEY_ID}"
       AWS_SECRET_ACCESS_KEY: "${AWS_SECRET_ACCESS_KEY}"
       AWS_DEFAULT_REGION: "${AWS_DEFAULT_REGION}"
diff --git a/test/stopping-containers-while-backing-up/docker-compose.yml b/test/stopping-containers-while-backing-up/docker-compose.yml
index adecdd0..1d6bb40 100644
--- a/test/stopping-containers-while-backing-up/docker-compose.yml
+++ b/test/stopping-containers-while-backing-up/docker-compose.yml
@@ -9,14 +9,14 @@ services:
     volumes:
       - grafana-data:/var/lib/grafana
     labels:
-      - "docker-volume-backup-companion.stop-during-backup=true"
+      - "docker-volume-backup.stop-during-backup=true"
 
   backup:
     build: ../..
     environment:
       BACKUP_CRON_EXPRESSION: "* * * * *"
       BACKUP_SOURCES: /mnt/grafana
-      AWS_S3_BUCKET_NAME: docker-volume-backup-companion-test
+      AWS_S3_BUCKET_NAME: docker-volume-backup-test
       AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
     volumes: