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

Fix docker script and document (#7786) 

Fixed error when keyboard parameter is omitted in interactive mode.
This commit is contained in:
shela 2020-01-10 09:44:16 +09:00 committed by Joel Challis
parent 886eb98e2a
commit 5a02cc00a4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/getting_started_build_tools.md
View File

@ -120,12 +120,12 @@ If this is a bit complex for you, Docker might be the turnkey solution you need.
util/docker_build.sh keyboard:keymap util/docker_build.sh keyboard:keymap
# For example: util/docker_build.sh ergodox_ez:steno # For example: util/docker_build.sh ergodox_ez:steno
``` ```
This will compile the desired keyboard/keymap and leave the resulting `.hex` or `.bin` file in the QMK directory for you to flash. If `:keymap` is omitted, the `default` keymap is used. Note that the parameter format is the same as when building with `make`. This will compile the desired keyboard/keymap and leave the resulting `.hex` or `.bin` file in the QMK directory for you to flash. If `:keymap` is omitted, all keymaps are used. Note that the parameter format is the same as when building with `make`.
You can also start the script without any parameters, in which case it will ask you to input the build parameters one by one, which you may find easier to use: You can also start the script without any parameters, in which case it will ask you to input the build parameters one by one, which you may find easier to use:
```bash ```bash
util/docker_build.sh util/docker_build.sh
# Reads parameters as input (leave blank for defaults) # Reads parameters as input (leave blank for all keyboards/keymaps)
``` ```
There is also support for building _and_ flashing the keyboard straight from Docker by specifying the `target` as well: There is also support for building _and_ flashing the keyboard straight from Docker by specifying the `target` as well:

3
util/docker_build.sh
View File

@ -37,6 +37,9 @@ else
exit 1 exit 1
fi fi
fi fi
if [ -z "$keyboard" ]; then
keyboard=all
fi
if [ -n "$target" ]; then if [ -n "$target" ]; then
if [ "$(uname)" = "Linux" ] || docker-machine active >/dev/null 2>&1; then if [ "$(uname)" = "Linux" ] || docker-machine active >/dev/null 2>&1; then
usb_args="--privileged -v /dev:/dev" usb_args="--privileged -v /dev:/dev"