From 6a1cd7f2b02fabdeb2a017dda1917e9ef64df6eb Mon Sep 17 00:00:00 2001
From: Pedro Pombeiro <PombeirP@users.noreply.github.com>
Date: Mon, 24 Sep 2018 22:21:13 +0200
Subject: [PATCH] Fix xgo creating files as `root` (#1210)

---
 .gitignore                        | 2 +-
 Makefile                          | 3 ++-
 _assets/build/xgo/base/Dockerfile | 2 ++
 _assets/build/xgo/base/build.sh   | 5 +++++
 _assets/ci/Jenkinsfile            | 2 +-
 _assets/ci/Jenkinsfile-manual     | 2 +-
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f9a0e9d7a..b2123dae7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ tags
 # used by the Makefile
 /build/_workspace/
 /build/bin/
-/vendor/github.com/karalabe/xgo
+/vendor/github.com/status-im/xgo
 
 # travis
 profile.tmp
diff --git a/Makefile b/Makefile
index 0022d12d2..04328401a 100644
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,8 @@ xgo-docker-images: ##@docker Build xgo docker images
 
 xgo:
 	docker pull $(XGOIMAGE)
-	go get github.com/karalabe/xgo
+	go get github.com/status-im/xgo
+	mkdir -p $(GOBIN)
 
 install-os-dependencies:
 	_assets/scripts/install_deps.sh
diff --git a/_assets/build/xgo/base/Dockerfile b/_assets/build/xgo/base/Dockerfile
index 044883690..8ee76b64a 100644
--- a/_assets/build/xgo/base/Dockerfile
+++ b/_assets/build/xgo/base/Dockerfile
@@ -1,5 +1,7 @@
 FROM karalabe/xgo-1.10.x
 
+VOLUME [ "/build", "/deps-cache" ]
+
 # Inject the container entry point, the build script (patched for Status bindings conditional builds of C code)
 ADD build.sh /build.sh
 ENV BUILD /build.sh
diff --git a/_assets/build/xgo/base/build.sh b/_assets/build/xgo/base/build.sh
index 7e99e055c..e63a0336d 100644
--- a/_assets/build/xgo/base/build.sh
+++ b/_assets/build/xgo/base/build.sh
@@ -298,6 +298,9 @@ for TARGET in $TARGETS; do
         (cd $archive && zip -r $bundle *)
         rm -rf $jni $archive
       fi
+
+      # Fix up permissions on bundle file
+      chown $UID:$GID $bundle
     fi
     # Clean up the android builds, toolchains and runtimes
     rm -rf /build-android-aar
@@ -583,6 +586,8 @@ for TARGET in $TARGETS; do
         echo -e "framework module \"$title\" {\n  header \"$title.h\"\n  export *\n}" > $framework/Versions/A/Modules/module.modulemap
         (cd $framework && ln -nsf Versions/A/Modules Modules)
 
+        # Fix up permissions on bundle file
+        chown $UID:$GID /build/$NAME-ios-$PLATFORM-framework
         chmod 777 -R /build/$NAME-ios-$PLATFORM-framework
       fi
       rm -rf /build-ios-fw
diff --git a/_assets/ci/Jenkinsfile b/_assets/ci/Jenkinsfile
index 39ae49aad..cfb7da919 100644
--- a/_assets/ci/Jenkinsfile
+++ b/_assets/ci/Jenkinsfile
@@ -36,7 +36,7 @@ node('linux') {
     // }
 
     stage('Build') {
-        sh 'go get github.com/karalabe/xgo'
+        sh 'go get github.com/status-im/xgo'
 
         parallel (
             'statusgo-android': {
diff --git a/_assets/ci/Jenkinsfile-manual b/_assets/ci/Jenkinsfile-manual
index d6b7a94e6..9a5225e6b 100644
--- a/_assets/ci/Jenkinsfile-manual
+++ b/_assets/ci/Jenkinsfile-manual
@@ -49,7 +49,7 @@ node('linux') {
     }
 
     stage('Build') {
-        sh 'go get github.com/karalabe/xgo'
+        sh 'go get github.com/status-im/xgo'
 
         parallel (
             'statusgo-android': {