diff options
| author |  zvecr <git@zvecr.com> | 2019-05-31 20:32:34 +0100 |
|---|---|---|
| committer |  Drashna Jaelre <drashna@live.com> | 2019-05-31 14:39:43 -0700 |
| commit | f9c0936cea630e078618bfd8ef3b686dacce2e76 (patch) | |
| tree | 6a062a57ca20471e975c00378f598ae10c94da3f | |
| parent | dabd73b769f6f0e08dd01d4bcd02d71bc5deaa8d (diff) | |
| download | qmk_firmware-f9c0936cea630e078618bfd8ef3b686dacce2e76.tar.gz | |
Initial attempt to fix docker creating files as root
| -rwxr-xr-x | util/travis_build.sh | 2 | ||||
| -rw-r--r-- | util/travis_test.sh | 2 |
2 files changed, 2 insertions, 2 deletions
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 |