g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initial attempt to fix docker creating files as root

master
zvecr 2019-05-31 20:32:34 +01:00 committed by Drashna Jaelre
parent dabd73b769
commit f9c0936cea
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/travis_build.sh
View File

@ -3,7 +3,7 @@
# if docker is installed - call make within the qmk docker image # if docker is installed - call make within the qmk docker image
if command -v docker >/dev/null; then if command -v docker >/dev/null; then
function make() { 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 fi

2
util/travis_test.sh
View File

@ -22,7 +22,7 @@ fi
# if docker is installed - call make within the qmk docker image # if docker is installed - call make within the qmk docker image
if command -v docker >/dev/null; then if command -v docker >/dev/null; then
function make() { 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 fi