Browse Source

unmount & terminate on SIGTERM

https://github.com/fphammerle/rgpgfs/commit/16fb3f04f9aa974fe06672e8df854020d33f74d1
https://github.com/fphammerle/rgpgfs/commit/1a50342b762526f59740a342735f5911b4ac21be
Fabian Peter Hammerle 5 years ago
parent
commit
1ea9a3b13b

+ 2 - 2
examples/rsync-sshd-incl-gpg-enc-pwd/docker-compose.yml

@@ -7,7 +7,7 @@ volumes:
 
 services:
   encfs:
-    image: fphammerle/reverse-encfs:0.1-encfs1.9.5
+    image: fphammerle/reverse-encfs:0.1.1-encfs1.9.5-amd64
     volumes:
     - plain_data:/plain/data:ro
     - encfs_password:/secret
@@ -18,7 +18,7 @@ services:
     cap_add: [SYS_ADMIN]
     security_opt: ['apparmor:unconfined']
   encfs_pwd_rgpgfs:
-    image: fphammerle/rgpgfs:0.1-amd64
+    image: fphammerle/rgpgfs:0.1.1-amd64
     environment:
       RECIPIENT: 1234567890ABCDEF1234567890ABCDEF12345678
     volumes:

+ 1 - 1
examples/rsync-sshd/docker-compose.yml

@@ -7,7 +7,7 @@ volumes:
 
 services:
   encfs:
-    image: fphammerle/reverse-encfs:0.1-encfs1.9.5
+    image: fphammerle/reverse-encfs:0.1.1-encfs1.9.5-amd64
     volumes:
     - plain_data:/plain/data:ro
     - encfs_password:/secret

+ 3 - 1
mount.sh

@@ -26,6 +26,8 @@ function copy_config {
 copy_config &
 set -x
 mkdir -p "$ENCFS_MOUNT_POINT"
+trap 'fusermount -u -z "$ENCFS_MOUNT_POINT"' SIGTERM
 encfs -f -o allow_other --reverse --standard \
     --extpass="cat \"$ENCFS_PASSWORD_PATH\"" \
-    "$ENCFS_SOURCE_DIR" "$ENCFS_MOUNT_POINT"
+    "$ENCFS_SOURCE_DIR" "$ENCFS_MOUNT_POINT" &
+wait $!