From cf6e5119276b8b31612f1dfb2a985714fe2a98ca Mon Sep 17 00:00:00 2001
From: Martin Honermeyer <maze@strahlungsfrei.de>
Date: Thu, 31 Oct 2019 00:29:15 +0100
Subject: [PATCH 1/4] Update changelog for 1.1.0

[ci skip]
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea754c8..e46437f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.1.0](https://github.com/djmaze/resticker/tree/1.1.0) (2019-10-30)
+
+[Full Changelog](https://github.com/djmaze/resticker/compare/1.0.1...1.1.0)
+
+**Implemented enhancements:**
+
+- Feature : Add curl to final image \(for Slack webhook\) [\#14](https://github.com/djmaze/resticker/pull/14) ([y3lousso](https://github.com/y3lousso))
+
 ## [1.0.1](https://github.com/djmaze/resticker/tree/1.0.1) (2019-10-26)
 
 [Full Changelog](https://github.com/djmaze/resticker/compare/1.0.0...1.0.1)

From e83b8cb7ba6563882f6dcac8179caa1dad8e2c6a Mon Sep 17 00:00:00 2001
From: Ean Schuessler <ean@brainfood.com>
Date: Fri, 22 Nov 2019 18:04:52 -0600
Subject: [PATCH 2/4] Use proper sh semantics for the entrypoint

Converted $* to "$@". This allows parameters to be passed correctly.
---
 entrypoint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entrypoint b/entrypoint
index 606bc71..84d32fa 100755
--- a/entrypoint
+++ b/entrypoint
@@ -9,7 +9,7 @@ elif [ ! -f "$RESTIC_REPOSITORY/config" ]; then
 fi
 
 if [[ $# -gt 0 ]]; then
-  exec restic $*
+  exec restic "$@"
 else
   exec go-cron "$BACKUP_CRON" /usr/local/bin/backup
 fi

From 10fb7b058e65a233d1e26cf0e8d83392efa8f106 Mon Sep 17 00:00:00 2001
From: Martin Honermeyer <maze@strahlungsfrei.de>
Date: Wed, 27 Nov 2019 22:31:11 +0100
Subject: [PATCH 3/4] docs: add restore example

closes #15
---
 README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README.md b/README.md
index 1204dd7..3556556 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,19 @@ Adjust the supplied [docker-swarm.yml](docker-swarm.example.yml) as needed. Then
 
     docker stack deploy -f docker-swarm.yml backup
 
+### Restoring
+
+In order to restore files on a host where the container is already running via Docker Compose, you can use `exec`:
+
+```bash
+# Find the latest snapshot for the current host (note the ID)
+docker-compose exec app snapshots -H <HOSTNAME>
+# Restore the given file on the host
+docker-compose exec app restore --include /path/to/file <ID>
+```
+
+When using Swarm mode, you need to manually SSH into the host and run `docker exec -it ..` accordingly.
+
 ### Advanced usage
 
 You can use the same config to run any restic command with the given configuration.

From d16e3caf2980f5236388b65763c3ee9be3d383c4 Mon Sep 17 00:00:00 2001
From: Martin Honermeyer <maze@strahlungsfrei.de>
Date: Wed, 27 Nov 2019 22:33:47 +0100
Subject: [PATCH 4/4] Update restic to 0.9.6

closes #17
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3e290ea..6d2b8cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@
 #
 FROM golang:1.12 AS builder
 
-ARG RESTIC_VERSION=0.9.5
-ARG RESTIC_SHA256=e22208e946ede07f56ef60c1c89de817b453967663ce4867628dff77761bd429
+ARG RESTIC_VERSION=0.9.6
+ARG RESTIC_SHA256=1cc8655fa99f06e787871a9f8b5ceec283c856fa341a5b38824a0ca89420b0fe
 ARG GO_CRON_VERSION=0.0.4
 ARG GO_CRON_SHA256=6c8ac52637150e9c7ee88f43e29e158e96470a3aaa3fcf47fd33771a8a76d959
 ARG RCLONE_VERSION=1.49.5