Fixed a few issues

Author: marclennox

backup-service/Dockerfile

@@ -91,7 +91,7 @@ ADD . /opt/backups
 VOLUME ["/data"]
 
 # Define entrypoint script.
-ENTRYPOINT ["./entrypoint"]
+ENTRYPOINT ["./script/docker-entrypoint.sh"]
 
 # Define default command.
 CMD ["/sbin/my_init"]

backup-service/entrypoint renamed to backup-service/script/docker-entrypoint.sh

@@ -17,11 +17,9 @@ case "${BACKUP_COMMAND}" in
     # Extract the backup task argument and execute it
     shift
     BACKUP_TASK=$1
-    shift
     command="script/trigger-backup.sh ${BACKUP_TASK}"
     ;;
   "schedule"|"scheduler"|"cron" )
-    shift
     # Write the crontab entries from the whenever schedule
     script/create-schedule.sh
     # Call the phusion baseimage docker initialization script

backup-service/script/trigger-backup.sh

@@ -13,4 +13,6 @@ if [ "${BACKUP_TASK}" == "" ]; then
 fi
 
 echo "Triggering backup task ${BACKUP_TASK}."
-exec backup perform --config-file="${BACKUP_CONFIG_DIR}/config.rb" --root-path="${BACKUP_DATA_DIR}" --trigger ${BACKUP_TASK}
+mkdir -p "${BACKUP_DATA_DIR}/.tmp"
+exec /usr/bin/flock --exclusive --wait 300 "${BACKUP_DATA_DIR}/.tmp/trigger-backup-${BACKUP_TASK}.lockfile" \
+  backup perform --config-file="${BACKUP_CONFIG_DIR}/config.rb" --root-path="${BACKUP_DATA_DIR}" --trigger ${BACKUP_TASK}