Browse Source

Initial attempt to fix docker creating files as root

pull/6040/head 0.6.394
zvecr 5 years ago
committed by Drashna Jaelre
parent
commit
f9c0936cea
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      util/travis_build.sh
  2. +1
    -1
      util/travis_test.sh

+ 1
- 1
util/travis_build.sh View File

@ -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


+ 1
- 1
util/travis_test.sh View File

@ -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


Loading…
Cancel
Save