From b785cad11f66b7f04a6aaaaf2b83b6d4fa9e8ccb Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 8 Jun 2018 20:37:14 +0200
Subject: [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
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Makefile')

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
-- 
cgit v1.2.3