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 /util | |
| parent | dabd73b769f6f0e08dd01d4bcd02d71bc5deaa8d (diff) | |
| download | qmk_firmware-f9c0936cea630e078618bfd8ef3b686dacce2e76.tar.gz qmk_firmware-f9c0936cea630e078618bfd8ef3b686dacce2e76.zip | |
Initial attempt to fix docker creating files as root
Diffstat (limited to 'util')
| -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 @@ | |||
| 3 | # if docker is installed - call make within the qmk docker image | 3 | # if docker is installed - call make within the qmk docker image |
| 4 | if command -v docker >/dev/null; then | 4 | if command -v docker >/dev/null; then |
| 5 | function make() { | 5 | function make() { |
| 6 | docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware qmkfm/qmk_firmware make "$@" | 6 | docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/qmk_firmware make "$@" |
| 7 | } | 7 | } |
| 8 | fi | 8 | fi |
| 9 | 9 | ||
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 | |||
| 22 | # if docker is installed - call make within the qmk docker image | 22 | # if docker is installed - call make within the qmk docker image |
| 23 | if command -v docker >/dev/null; then | 23 | if command -v docker >/dev/null; then |
| 24 | function make() { | 24 | function make() { |
| 25 | docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware qmkfm/qmk_firmware make "$@" | 25 | docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/qmk_firmware make "$@" |
| 26 | } | 26 | } |
| 27 | fi | 27 | fi |
| 28 | 28 | ||