diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index dc408594..9fb6b74f 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -38,7 +38,10 @@ jobs: snap run snapcraft login --with secret - name: snap - run: docker-compose up --build --abort-on-container-exit + run: | + docker-compose build --build-arg VER=$NBGV_SimpleVersion + docker-compose up --no-build --abort-on-container-exit + working-directory: sshpiperd/snap - name: push diff --git a/sshpiperd/snap/docker-compose.yml b/sshpiperd/snap/docker-compose.yml index 49be64f5..9e530bb3 100644 --- a/sshpiperd/snap/docker-compose.yml +++ b/sshpiperd/snap/docker-compose.yml @@ -12,12 +12,15 @@ services: command: - "./build.sh" piper: - build: ../.. + build: + context: ../.. + args: + - VER=devel volumes: - build:/build command: - "/bin/sh" - "-c" - - "/bin/cp /sshpiperd /build/sshpiperd && sleep 1h" + - "/bin/cp /sshpiperd /build/sshpiperd && /build/sshpiperd version && sleep 1h" volumes: build: diff --git a/sshpiperd/snap/snapcraft.yaml b/sshpiperd/snap/snapcraft.yaml index a37a81c1..c7fea44d 100644 --- a/sshpiperd/snap/snapcraft.yaml +++ b/sshpiperd/snap/snapcraft.yaml @@ -1,17 +1,14 @@ name: sshpiperd -version: 0.6.0 +version: devel summary: The missing reverse proxy for ssh scp description: | SSH Piper works as a proxy-like ware, and route connections by username, src ip , etc. - grade: stable confinement: strict - parts: sshpiperd: plugin: dump source: /build - apps: sshpiperd-daemon: command: sshpiperd daemon --config $SNAP_DATA/sshpiperd.ini @@ -19,7 +16,6 @@ apps: daemon: simple sshpiperd: command: sshpiperd --config $SNAP_DATA/sshpiperd.ini - hooks: configure: plugs: [home]