Update qmk, navigator
This commit is contained in:
@ -48,30 +48,28 @@ RUN python3 -m pip install --upgrade \
|
||||
nose2 \
|
||||
yapf
|
||||
|
||||
# upgrade avr-gcc... for reasons?
|
||||
# upgrade avr-gcc, ergodox patch
|
||||
RUN /bin/bash -c "set -o pipefail && \
|
||||
wget -q https://github.com/ZakKemble/avr-gcc-build/releases/download/v8.3.0-1/avr-gcc-8.3.0-x64-linux.tar.bz2 -O - | tee /tmp/asdf.tar.bz2 | md5sum -c <(echo '588D0BEA4C5D21A1A06AA17625684417 -') && \
|
||||
tar xfj /tmp/asdf.tar.bz2 --strip-components=1 -C / && \
|
||||
wget -q https://github.com/ZakKemble/avr-gcc-build/releases/download/v8.3.0-1/avr-gcc-8.3.0-x64-linux.tar.bz2 -O - | tee /tmp/avr-gcc.tar.bz2 | md5sum -c <(echo '588D0BEA4C5D21A1A06AA17625684417 -') && \
|
||||
tar xfj /tmp/avr-gcc.tar.bz2 --strip-components=1 -C / && \
|
||||
rm -rf /share/ /tmp/*"
|
||||
|
||||
|
||||
|
||||
|
||||
# Install qmk-cli
|
||||
COPY --from=qmk_cli_builder /app/dist /tmp/dist
|
||||
RUN python3 -m pip install /tmp/dist/qmk-*.whl && \
|
||||
rm -rf /tmp/dist
|
||||
|
||||
# Copy qmk repo.
|
||||
# Make sure you've pulled submodules first!
|
||||
COPY qmk_firmware /qmk_firmware
|
||||
# Don't forget to sync submodules
|
||||
# Temporarily use ZSA, qmk doesn't support navigator yet
|
||||
COPY zsa_firmware /qmk_firmware
|
||||
RUN chmod -R 777 /qmk_firmware
|
||||
|
||||
RUN /usr/bin/python3 -m pip install -r /qmk_firmware/requirements.txt
|
||||
|
||||
VOLUME /qmk_firmware/keyboards
|
||||
VOLUME /build_output
|
||||
WORKDIR /qmk_firmware
|
||||
|
||||
ENV SKIP_GIT true
|
||||
ENV SKIP_GIT=true
|
||||
|
||||
COPY entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
Submodule docker/qmk_cli updated: aecd02e850...7be310f364
Submodule docker/qmk_firmware updated: 0f341dfdd3...8f728aa731
1
docker/zsa_firmware
Submodule
1
docker/zsa_firmware
Submodule
Submodule docker/zsa_firmware added at e87a3e6949
Reference in New Issue
Block a user