From 3cc6de8c6393e056961d8bc11612f54d3138c1f0 Mon Sep 17 00:00:00 2001
From: System administrator
Date: Thu, 1 Jun 2017 10:44:24 +0200
Subject: Move service images

---
 images/backup/backup.yml  | 21 ---------------------
 images/backup/restore.yml | 16 ----------------
 services/backup.yml       | 21 +++++++++++++++++++++
 services/restore.yml      | 16 ++++++++++++++++
 4 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 images/backup/backup.yml
 delete mode 100644 images/backup/restore.yml
 create mode 100644 services/backup.yml
 create mode 100644 services/restore.yml

diff --git a/images/backup/backup.yml b/images/backup/backup.yml
deleted file mode 100644
index c182b8d..0000000
--- a/images/backup/backup.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: '3'
-
-services:
-  backup:
-    env_file:
-      - config.env
-    build: ./duplicity
-    command: /bin/sh /backup.sh
-    hostname: duplicity
-    restart: "no"
-    volumes:
-      - cache:/cache
-      - ./gpg_keys:/gpg_keys:ro
-
-      - git_data:/data/git
-
-volumes:
-  cache:
-
-    #  server_git_data:
-    #external: true
diff --git a/images/backup/restore.yml b/images/backup/restore.yml
deleted file mode 100644
index 6640b26..0000000
--- a/images/backup/restore.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: '3'
-
-services:
-  backup:
-    env_file:
-      - config.env
-    build: ./duplicity
-    command: /bin/sh /restore.sh
-    hostname: duplicity
-    restart: "no"
-    volumes:
-      - ./restored:/data
-      - ./gpg_keys:/gpg_keys
-
-volumes:
-  cache:
diff --git a/services/backup.yml b/services/backup.yml
new file mode 100644
index 0000000..a3b2218
--- /dev/null
+++ b/services/backup.yml
@@ -0,0 +1,21 @@
+version: '3'
+
+services:
+  backup:
+    env_file:
+      - $IMAGES/backup/config.env
+    build: $IMAGES/backup/duplicity
+    command: /bin/sh /backup.sh
+    hostname: backup
+    restart: "no"
+    volumes:
+      - cache:/cache
+      - $IMAGES/backup/gpg_keys:/gpg_keys:ro
+
+      - git_data:/data/git
+
+volumes:
+  cache:
+
+    #  server_git_data:
+    #external: true
diff --git a/services/restore.yml b/services/restore.yml
new file mode 100644
index 0000000..d1739aa
--- /dev/null
+++ b/services/restore.yml
@@ -0,0 +1,16 @@
+version: '3'
+
+services:
+  restore:
+    env_file:
+      - $IMAGES/backup/config.env
+    build: $IMAGES/backup/duplicity
+    command: /bin/sh /restore.sh
+    hostname: duplicity
+    restart: "no"
+    volumes:
+      - ./restored:/data
+      - $IMAGES/backup/gpg_keys:/gpg_keys
+
+volumes:
+  cache:
-- 
cgit v1.2.3