Merge pull request #102 from djmaze/skip-repository-check-when-unlocking

Skip repository check when unlock command is given

README.md

@@ -12,6 +12,7 @@ Run automatic [restic](https://restic.github.io/) backups via a Docker container
 * support for tags, exclude definitions, and all other optional restic options
 * automatic forgetting of old backups
 * prune backups on a schedule
+* remove a stale repository lock
 * can be used as a (global) Docker swarm service in order to backup every cluster node
 * multi-arch: the image `mazzolino/restic` runs on `amd64` as well as `armv7` (for now)
 
@@ -58,6 +59,8 @@ E.g.
 
     docker-compose run --rm app snapshots
 
+When given the `unlock` command, the repository check will be skipped (because it will fail on a locked repository either way).
+
 ## Configuration options
 
 *Note: `BACKUP_CRON`, `PRUNE_CRON` and `CHECK_CRON` are mutually exclusive.*

entrypoint

@@ -16,23 +16,27 @@ if [[ -d "$SSH_CONFIG_PATH" ]]; then
   chmod -R u+rwX,go-rwx /root/.ssh
 fi
 
-echo "Checking configured repository '${RESTIC_REPOSITORY}' ..."
-if restic cat config > /dev/null; then
-  echo "Repository found."
-else
-  echo "Could not access the configured repository. Trying to initialize (in case it has not been initialized yet) ..."
-  if restic init; then
-    echo "Repository successfully initialized."
+command="${1-}"
+
+if [[ "$command" != "unlock" ]]; then
+  echo "Checking configured repository '${RESTIC_REPOSITORY}' ..."
+  if restic cat config > /dev/null; then
+    echo "Repository found."
   else
-    if [ "${SKIP_INIT_CHECK:-}" == "true" ]; then
-      echo "Initialization failed. Ignoring errors because SKIP_INIT_CHECK is set in your configuration."
+    echo "Could not access the configured repository. Trying to initialize (in case it has not been initialized yet) ..."
+    if restic init; then
+      echo "Repository successfully initialized."
     else
-      echo "Initialization failed. Please see error messages above and check your configuration. Exiting."
-      exit 1
+      if [ "${SKIP_INIT_CHECK:-}" == "true" ]; then
+        echo "Initialization failed. Ignoring errors because SKIP_INIT_CHECK is set in your configuration."
+      else
+        echo "Initialization failed. Please see error messages above and check your configuration. Exiting."
+        exit 1
+      fi
     fi
   fi
+  echo -e "\n"
 fi
-echo -e "\n"
 
 if [[ $# -gt 0 ]]; then
   exec restic "$@"