X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Fdocker_build.sh;h=6feeb1f5d26559f9f30c7e69b0e67baf6032cd9c;hb=0a03f7cff7b6892ca93333fa5061c1ca454de0cb;hp=35839ac41eb218a9017de1cf65e584d0c107137c;hpb=908966bdf36605301d27cdcae82c3201c156a43f;p=qmk_firmware.git diff --git a/util/docker_build.sh b/util/docker_build.sh index 35839ac41..6feeb1f5d 100755 --- a/util/docker_build.sh +++ b/util/docker_build.sh @@ -35,7 +35,7 @@ else fi if [ -n "$target" ]; then if [ "$(uname)" = "Linux" ] || docker-machine active >/dev/null 2>&1; then - usb_args="--privileged -v /dev/bus/usb:/dev/bus/usb" + usb_args="--privileged -v /dev:/dev" else echo "Error: target requires docker-machine to work on your platform" >&2 echo "See http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos" >&2 @@ -46,5 +46,5 @@ fi dir=$(pwd -W 2>/dev/null) || dir=$PWD # Use Windows path if on Windows # Run container and build firmware -docker run --rm -it $usb_args -v "$dir":/qmk_firmware qmkfm/qmk_firmware \ - /bin/bash -c "make git-submodule; make \"$keyboard${keymap:+:$keymap}${target:+:$target}\"" +docker run --rm -it $usb_args -w /qmk_firmware/ -v "$dir":/qmk_firmware qmkfm/base_container \ + make "$keyboard${keymap:+:$keymap}${target:+:$target}"