summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzvecr <git@zvecr.com>2019-05-31 20:32:34 +0100
committerFlorian Didron <fdidron@users.noreply.github.com>2019-06-04 17:59:59 +0900
commit3a96a585e190f4c51919df85f1fbae3983b30ef7 (patch)
tree755bd23b6f22478ed0b576f67bf1cb1204a864bd
parent6005f6b6bbe3f0b6ee721b41da68ae5fcbadf967 (diff)
Initial attempt to fix docker creating files as root
-rwxr-xr-xutil/travis_build.sh2
-rw-r--r--util/travis_test.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/util/travis_build.sh b/util/travis_build.sh
index 02a749e851..554ec8b689 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 b6ec06f059..3be4afff7a 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