From c98d65fd03a1da134f79bf2b67f28bdf7648b95e Mon Sep 17 00:00:00 2001 From: zvecr Date: Wed, 5 Jun 2019 01:17:01 +0100 Subject: Update docker util script and travis to use new base container --- util/docker_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util/docker_build.sh') diff --git a/util/docker_build.sh b/util/docker_build.sh index 35839ac41e..1e17bfbedc 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 \ - /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}" -- cgit v1.2.3