From 99b37ea88084680cc334cca8ea6b751f60eefe29 Mon Sep 17 00:00:00 2001 From: napnap75 Date: Sat, 20 Feb 2021 15:37:06 +0100 Subject: [PATCH] Updated restic-auto with the docker command --- restic-auto/Dockerfile | 2 +- restic-auto/restic-auto | 48 ++++++++++++++++++----------------------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/restic-auto/Dockerfile b/restic-auto/Dockerfile index 1e6343f..983ecba 100644 --- a/restic-auto/Dockerfile +++ b/restic-auto/Dockerfile @@ -13,7 +13,7 @@ FROM alpine:latest COPY --from=builder restic /usr/bin/ -RUN apk add --no-cache bash curl jq openssh-client dcron tzdata +RUN apk add --no-cache bash curl jq openssh-client dcron tzdata docker COPY restic-auto docker-entrypoint.sh docker-command.sh /usr/local/bin/ diff --git a/restic-auto/restic-auto b/restic-auto/restic-auto index b70ff73..d00973b 100755 --- a/restic-auto/restic-auto +++ b/restic-auto/restic-auto @@ -32,17 +32,17 @@ count_success=0 count_failure=0 # List all the containers -containers=$(curl -s --unix-socket /var/run/docker.sock http:/v1.26/containers/json) -for container_id in $(echo $containers | jq ".[].Id") ; do - container=$(echo $containers | jq -c ".[] | select(.Id==$container_id)") - +for container_id in $(docker ps -aq) ; do + container_json=$(docker inspect $container_id) # Get the name and namespace (in case of a container run in a swarm stack) - container_name=$(echo $container | jq -r ".Names | .[0]" | cut -d'.' -f1 | cut -d'/' -f2) - namespace=$(echo $container | jq -r ".Labels | .[\"com.docker.stack.namespace\"]") + container_name=$(echo $container_json | jq -r '.[].Name' | cut -d'/' -f2) +# namespace=$(echo $container | jq -r ".Labels | .[\"com.docker.stack.namespace\"]") # Backup the dirs labelled with "napnap75.backup.dirs" - if $(echo $container | jq ".Labels | has(\"napnap75.backup.dirs\")") ; then - for dir_name in $(echo $container | jq -r ".Labels | .[\"napnap75.backup.dirs\"]") ; do + + backup_dirs=$(echo $container_json | jq -r '.[].Config.Labels."napnap75.backup.dirs"') + if [ "$backup_dirs" != "null" ] ; then + for dir_name in $backup_dirs ; do echo "[INFO] Backing up dir" $dir_name "for container" $container_name backup_dir $dir_name if [ $? -ne 0 ]; then @@ -54,10 +54,11 @@ for container_id in $(echo $containers | jq ".[].Id") ; do fi # Backup the volumes labelled with "napnap75.backup.volumes" - if $(echo $container | jq ".Labels | has(\"napnap75.backup.volumes\")") ; then - for volume_name in $(echo $container | jq -r ".Labels | .[\"napnap75.backup.volumes\"]") ; do - if [ $namespace != "null" ] ; then volume_name="${namespace}_${volume_name}" ; fi - volume_mount=$(echo $container | jq -r ".Mounts[] | select(.Name==\"$volume_name\") | .Source") + backup_volumes=$(echo $container_json | jq -r '.[].Config.Labels."napnap75.backup.volumes"') + if [ "$backup_volumes" != "null" ] ; then + for volume_name in $backup_volumes ; do +# if [ $namespace != "null" ] ; then volume_name="${namespace}_${volume_name}" ; fi + volume_mount=$(echo $container_json | jq -r ".[].Mounts[] | select(.Name==\"$volume_name\") | .Source") echo "[INFO] Backing up volume" $volume_name "with mount" $volume_mount "for container" $container_name backup_dir $volume_mount if [ $? -ne 0 ]; then @@ -69,31 +70,24 @@ for container_id in $(echo $containers | jq ".[].Id") ; do fi # Backup the databases labelled with "napnap75.backup.databases" - if $(echo $container | jq ".Labels | has(\"napnap75.backup.databases\")") ; then - container_id=$(echo $container_id | sed "s/\"//g") - database_password=$(curl -s --unix-socket /var/run/docker.sock http:/v1.26/containers/$container_id/json | jq -r ".Config.Env[] | match(\"MYSQL_ROOT_PASSWORD=(.*)\") | .captures[0].string") - for database_name in $(echo $container | jq -r ".Labels | .[\"napnap75.backup.databases\"]") ; do + backup_databases=$(echo $container_json | jq -r '.[].Config.Labels."napnap75.backup.databases"') + if [ "$backup_databases" != "null" ] ; then + for database_name in $backup_databases ; do echo "[INFO] Backing up database" $database_name "for container" $container_name - if [[ "$database_password" != "" ]] ; then - exec_id=$(curl -s --unix-socket /var/run/docker.sock -X POST -H "Content-Type: application/json" -d '{"AttachStdout":true,"AttachStderr":true,"Tty":true,"Cmd":["/bin/bash", "-c", "mysqldump -p'$database_password' --databases '$database_name'"]}' http:/v1.26/containers/$container_id/exec | jq ".Id" | sed "s/\"//g") - else - exec_id=$(curl -s --unix-socket /var/run/docker.sock -X POST -H "Content-Type: application/json" -d '{"AttachStdout":true,"AttachStderr":true,"Tty":true,"Cmd":["/bin/bash", "-c", "mysqldump --databases '$database_name'"]}' http:/v1.26/containers/$container_id/exec | jq ".Id" | sed "s/\"//g") - fi - curl -s --unix-socket /var/run/docker.sock -X POST -H "Content-Type: application/json" -d '{"Detach":false,"Tty":false}' http:/v1.26/exec/$exec_id/start | gzip > /tmp/database_backup.gz - exit_code=$(curl -s --unix-socket /var/run/docker.sock http:/v1.26/exec/$exec_id/json | jq ".ExitCode") - if [ $exit_code -ne 0 ]; then + docker exec $container_id bash -c "mysqldump --databases $database_name | gzip -c > /tmp/database_backup.sql.gz" + if [ $? -ne 0 ]; then echo "[ERROR] Unable to backup database $database_name from container $container_name" - cat /tmp/database_backup.gz | gzip -d ((++count_failure)) else - backup_file /tmp/database_backup.gz ${container_name}—${database_name}.sql.gz + container_overlay=$(echo $container_json | jq -r '.[].GraphDriver.Data.MergedDir') + backup_file /root_fs${container_overlay}/tmp/database_backup.sql.gz ${container_name}—${database_name}.sql.gz if [ $? -ne 0 ]; then ((++count_failure)) else ((++count_success)) fi fi - rm /tmp/database_backup.gz + docker exec $container_id bash -c "rm /tmp/database_backup.sql.gz" done fi done