From 8fe1e9cb7a46fbfb2dc2d495d19202e92ccd69b6 Mon Sep 17 00:00:00 2001
From: Boshi Lian <farmer1992@gmail.com>
Date: Sun, 3 Apr 2022 23:33:35 +0000
Subject: [PATCH] move snap build to vol

---
 .gitignore                        |  1 -
 sshpiperd/snap/build.sh           |  4 ----
 sshpiperd/snap/docker-compose.yml | 14 ++++++++++----
 3 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100755 sshpiperd/snap/build.sh

diff --git a/.gitignore b/.gitignore
index 9ca1672b..f01699d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ _testmain.go
 *.test
 *.prof
 sshpiperd/example/sshpiperd_key*
-sshpiperd/snap
 sshpiperd/sshpiperd
 sshpiperd/__debug_bin
 sshpiperd/sshpiperd.ini
diff --git a/sshpiperd/snap/build.sh b/sshpiperd/snap/build.sh
deleted file mode 100755
index 66759b8d..00000000
--- a/sshpiperd/snap/build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-snapcraft clean
-snapcraft
diff --git a/sshpiperd/snap/docker-compose.yml b/sshpiperd/snap/docker-compose.yml
index 9e530bb3..6886afd0 100644
--- a/sshpiperd/snap/docker-compose.yml
+++ b/sshpiperd/snap/docker-compose.yml
@@ -5,12 +5,17 @@ services:
     image: snapcore/snapcraft
     volumes:
       - build:/build
-      - .:/stage
+      - stage:/stage
+      - ./snapcraft.yaml:/stage/snapcraft.yaml
+      - ./snap:/stage/snap
+      - .:/output
     working_dir: /stage
     depends_on:
       - piper
-    command:
-      - "./build.sh"
+    command: 
+      - "/bin/sh"
+      - "-c"
+      - "snapcraft clean && snapcraft && cp /stage/*.snap /output"
   piper:
     build: 
       context: ../..
@@ -23,4 +28,5 @@ services:
       - "-c"
       - "/bin/cp /sshpiperd /build/sshpiperd && /build/sshpiperd version && sleep 1h"
 volumes:
-  build: 
+  build:
+  stage: