diff options
| author | Mikhail Goncharov <goncharov.mikhail@gmail.com> | 2018-04-10 18:47:56 +0100 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-04-09 09:44:55 -0700 |
| commit | 399b992b018d7bd7fa8b14665269bee654c89e63 (patch) | |
| tree | 6c5c39a05c97e11d922f117263d8b888ec7dba78 | |
| parent | ffd18ce4092e8bda0a115d27d96ebc0af39e3b67 (diff) | |
Update build instructions and Dockerfile to download submodules
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rwxr-xr-x | util/docker_build.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index 6bd5acb335..c4acfec71a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,4 +26,4 @@ VOLUME /qmk_firmware WORKDIR /qmk_firmware COPY . . -CMD make $KEYBOARD:$KEYMAP +CMD make clean ; make git-submodule ; make $KEYBOARD:$KEYMAP diff --git a/util/docker_build.sh b/util/docker_build.sh index e7aeac8f3e..35839ac41e 100755 --- a/util/docker_build.sh +++ b/util/docker_build.sh @@ -47,4 +47,4 @@ 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 \ - make "$keyboard${keymap:+:$keymap}${target:+:$target}" + /bin/bash -c "make git-submodule; make \"$keyboard${keymap:+:$keymap}${target:+:$target}\"" |