diff options
| author | Felix (xq) Queißner <git@mq32.de> | 2020-06-30 22:59:56 +0200 |
|---|---|---|
| committer | Felix (xq) Queißner <git@mq32.de> | 2020-06-30 22:59:56 +0200 |
| commit | 33bde18e393b4c4ca37d5dde15154e097b19f96c (patch) | |
| tree | 59f8914d21d1d0dcdd8ff61a0f0db9e60a977c24 | |
| parent | 55e3682e9fdc2d77abd6acaaea361fc1e2487402 (diff) | |
| parent | a3746f75d8248f242c1d4a8d953883a88350677f (diff) | |
| download | kristall-33bde18e393b4c4ca37d5dde15154e097b19f96c.tar.gz | |
Merge branch 'master' of github.com:MasterQ32/kristall
| -rwxr-xr-x | ci/build-and-deploy.sh | 8 | ||||
| -rw-r--r-- | ci/docker-compose.yml | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/ci/build-and-deploy.sh b/ci/build-and-deploy.sh new file mode 100755 index 0000000..a1a7ae8 --- /dev/null +++ b/ci/build-and-deploy.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -eo pipefail + +# First, do the docker build +docker-compose up + +scp -i /home/ci/secret/kristall_ci output/Kristall-nightly-x86_64.AppImage kristall-ci@kristall.random-projects.net:. diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml index 9a77052..d80253a 100644 --- a/ci/docker-compose.yml +++ b/ci/docker-compose.yml @@ -9,3 +9,7 @@ services: - /dev/fuse:/dev/fuse cap_add: - SYS_ADMIN + security_opt: + - apparmor:unconfined + - seccomp:unconfined + |