summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2018-06-08 20:37:14 +0200
committerKali Kaneko <kali@leap.se>2018-06-08 21:06:06 +0200
commitb785cad11f66b7f04a6aaaaf2b83b6d4fa9e8ccb (patch)
treed4252a4218e889ced31be70b97c36e53d988a89d /Makefile
parent1a2f3154ad202a9e50c4cbb9c4c41d9ba350b552 (diff)
[pkg] build snap in docker/xenial
the docker image provider bv snapcore/snapcraft is based on xenial, and we need a special tag for the golang gtk3 libraries to be able to build here. -Closes: #9315
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 153d6130..1aabad2b 100644
--- a/Makefile
+++ b/Makefile
@@ -121,7 +121,9 @@ bundle_in_docker_virtualenv:
snap_in_docker:
cd pkg/riseupvpn && ./pack_installers && cd ..
- sudo docker run -v $(PWD):$(PWD) -w $(PWD) snapcore/snapcraft snapcraft
+ cp snap/snapcraft.yaml snap/snapcraft.yaml.orig && cd snap && sed -i s/"#PRAGMA:XENIAL "// snapcraft.yaml && cd ..
+ echo "apt update && apt -f install && snapcraft" | sudo docker run -i -v $(PWD):$(PWD) -w $(PWD) snapcore/snapcraft bash
+ mv snap/snapcraft.yaml.orig snap/snapcraft.yaml
snap_clean:
sudo rm -rf stage prime parts