From: zvecr <git@zvecr.com>
Date: Fri, 31 May 2019 19:32:34 +0000 (+0100)
Subject: Initial attempt to fix docker creating files as root
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f9c0936cea630e078618bfd8ef3b686dacce2e76;p=qmk_firmware.git

Initial attempt to fix docker creating files as root
---

diff --git a/util/travis_build.sh b/util/travis_build.sh
index 02a749e85..554ec8b68 100755
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -3,7 +3,7 @@
 # if docker is installed - call make within the qmk docker image
 if command -v docker >/dev/null; then
   function make() {
-    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware qmkfm/qmk_firmware make "$@"
+    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/qmk_firmware make "$@"
   }
 fi
 
diff --git a/util/travis_test.sh b/util/travis_test.sh
index b6ec06f05..3be4afff7 100644
--- a/util/travis_test.sh
+++ b/util/travis_test.sh
@@ -22,7 +22,7 @@ fi
 # if docker is installed - call make within the qmk docker image
 if command -v docker >/dev/null; then
   function make() {
-    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware qmkfm/qmk_firmware make "$@"
+    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/qmk_firmware make "$@"
   }
 fi