From 0a03f7cff7b6892ca93333fa5061c1ca454de0cb Mon Sep 17 00:00:00 2001
From: zvecr <git@zvecr.com>
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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util/docker_build.sh')

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}"
-- 
cgit v1.2.3


From 9813a6f950b46277eb29c54105809767cc0daa65 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 15 Aug 2019 22:03:26 +0100
Subject: Add an alternative method for keyboard discovery to speed up build
 (#6073)

* Add an alternative method for keyboard discovery to speed up build

* Chain MAKEFLAGS for docker_build.sh

* Slight improvement to number of items sent to sort

* Remove debug line

* Fix line escape
---
 util/docker_build.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'util/docker_build.sh')

diff --git a/util/docker_build.sh b/util/docker_build.sh
index 6feeb1f5d..f36d5bcde 100755
--- a/util/docker_build.sh
+++ b/util/docker_build.sh
@@ -46,5 +46,11 @@ 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 -w /qmk_firmware/ -v "$dir":/qmk_firmware qmkfm/base_container \
+docker run --rm -it $usb_args \
+    -w /qmk_firmware/ \
+	-v "$dir":/qmk_firmware \
+	-e ALT_GET_KEYBOARDS=true \
+	-e SKIP_GIT="$SKIP_GIT" \
+	-e MAKEFLAGS="$MAKEFLAGS" \
+	qmkfm/base_container \
 	make "$keyboard${keymap:+:$keymap}${target:+:$target}"
-- 
cgit v1.2.3


From 4d339b7b5d1ecc2320080798d7e07e2d43675578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?=
 <vomindoraan@gmail.com>
Date: Sat, 7 Sep 2019 10:17:54 +0200
Subject: Update docker_build.sh: indentation fix, error echo function (#6659)

* Replace spaces with tab in docker_build.sh

* Use errcho instead of echo >&2
---
 util/docker_build.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'util/docker_build.sh')

diff --git a/util/docker_build.sh b/util/docker_build.sh
index f36d5bcde..99d59d169 100755
--- a/util/docker_build.sh
+++ b/util/docker_build.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 # NOTE: This script uses tabs for indentation
 
+errcho() {
+	echo "$@" >&2
+}
+
 USAGE="Usage: $0 [keyboard[:keymap[:target]]]"
 
 # Check preconditions
@@ -11,11 +15,11 @@ for arg; do
 	fi
 done
 if [ $# -gt 1 ]; then
-	echo "$USAGE" >&2
+	errcho "$USAGE"
 	exit 1
 elif ! command -v docker >/dev/null 2>&1; then
-	echo "Error: docker not found" >&2
-	echo "See https://docs.docker.com/install/#supported-platforms for installation instructions" >&2
+	errcho "Error: docker not found"
+	errcho "See https://docs.docker.com/install/#supported-platforms for installation instructions"
 	exit 2
 fi
 
@@ -29,7 +33,7 @@ else
 	$1
 	EOF
 	if [ -n "$x" ]; then
-		echo "$USAGE" >&2
+		errcho "$USAGE"
 		exit 1
 	fi
 fi
@@ -37,9 +41,9 @@ if [ -n "$target" ]; then
 	if [ "$(uname)" = "Linux" ] || docker-machine active >/dev/null 2>&1; then
 		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
-		echo "Consider flashing with QMK Toolbox (https://github.com/qmk/qmk_toolbox) instead" >&2
+		errcho "Error: target requires docker-machine to work on your platform"
+		errcho "See http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos"
+		errcho "Consider flashing with QMK Toolbox (https://github.com/qmk/qmk_toolbox) instead"
 		exit 3
 	fi
 fi
@@ -47,7 +51,7 @@ 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 \
-    -w /qmk_firmware/ \
+	-w /qmk_firmware \
 	-v "$dir":/qmk_firmware \
 	-e ALT_GET_KEYBOARDS=true \
 	-e SKIP_GIT="$SKIP_GIT" \
-- 
cgit v1.2.3