diff options
| author |  zvecr <git@zvecr.com> | 2019-06-05 01:17:01 +0100 |
|---|---|---|
| committer |  skullydazed <skullydazed@users.noreply.github.com> | 2019-07-14 21:01:38 -0700 |
| commit | 0a03f7cff7b6892ca93333fa5061c1ca454de0cb (patch) | |
| tree | ed536454985c9fc4a78e43781bcacce9f163d627 /util | |
| parent | 21fc6be41bd2a72ad52b00db8c9386e17bacd87f (diff) | |
| download | qmk_firmware-0a03f7cff7b6892ca93333fa5061c1ca454de0cb.tar.gz | |
Update docker util script and travis to use new base container
Diffstat (limited to 'util')
| -rwxr-xr-x | util/docker_build.sh | 2 | ||||
| -rwxr-xr-x | util/travis_build.sh | 2 | ||||
| -rw-r--r-- | util/travis_test.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/util/docker_build.sh b/util/docker_build.sh index c573ebcae..6feeb1f5d 100755 --- a/util/docker_build.sh +++ b/util/docker_build.sh @@ -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 \ +docker run --rm -it $usb_args -w /qmk_firmware/ -v "$dir":/qmk_firmware qmkfm/base_container \ make "$keyboard${keymap:+:$keymap}${target:+:$target}" diff --git a/util/travis_build.sh b/util/travis_build.sh index 554ec8b68..fd5511a72 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 --user $(id -u):$(id -g) qmkfm/qmk_firmware make "$@" + docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@" } fi diff --git a/util/travis_test.sh b/util/travis_test.sh index 3be4afff7..e6a50ac16 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 --user $(id -u):$(id -g) qmkfm/qmk_firmware make "$@" + docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@" } fi |