From d2355fab67c3655127792754416042257a83d023 Mon Sep 17 00:00:00 2001
From: Stanislaw Adaszewski <s.adaszewski@gmail.com>
Date: Mon, 27 Apr 2020 14:09:56 +0200
Subject: [PATCH] More explicit tag/untag for images

---
 focker-compose.yml | 47 ++++++++++++++++++++++++++--------------------
 image.py           |  4 ++--
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/focker-compose.yml b/focker-compose.yml
index e4be7a5..0a8905c 100644
--- a/focker-compose.yml
+++ b/focker-compose.yml
@@ -1,23 +1,30 @@
-variables:
-  ext_if: em0
-  gateway_ip: 127.0.0.2
+#
+# focker compose wordpress.yml
+# focker compose wordpress.yml backup
+# focker compose wordpress.yml restore
+#
 
-defaults:
-  jail:
-    mount.devfs: true
-    interface: lo1
-    exec.start: /bin/sh /etc/rc
-    exec.stop: /bin/sh /etc/rc.shutdown
-  pf: |
-    rdr on $(ext_if) proto tcp from any to any port 80 -> $(jail_ip)
-
-services:
-  gateway:
-    image: freebsd-12.1
-    jail:
-      ip4.address: $(gateway_ip)
-    pf:
-      - pass on $(ext_if)
+jails:
+  wordpress:
+    image: wordpress-5
+    mounts:
+      test-volume2: /mnt/volume2
+      test-volume: /mnt/volume1
+    ip4.addr: 127.0.1.1
 
 volumes:
-  gateway-data: {}
+  test-volume2: {}
+  test-volume: {}
+
+commands:
+  backup:
+    jail: wordpress
+    command: |
+      mysqldump >/mnt/volume2/backup.sql
+    mounts:
+      test-volume2: /mnt/volume2
+
+  restore:
+    jail: wordpress
+    command: |
+      mysql </mnt/volume2/backup.sql
diff --git a/image.py b/image.py
index f944daa..49dd95b 100644
--- a/image.py
+++ b/image.py
@@ -66,13 +66,13 @@ def command_image_build(args):
 
 
 def command_image_tag(args):
-    zfs_untag(args.tags)
+    zfs_untag(args.tags, focker_type='image')
     name, _ = zfs_find(args.reference, focker_type='image', zfs_type='filesystem')
     zfs_tag(name, args.tags)
 
 
 def command_image_untag(args):
-    zfs_untag(args.tags)
+    zfs_untag(args.tags, focker_type='image')
 
 
 def command_image_list(args):