diff options
| author | William Chang <william@factual.com> | 2019-07-13 10:18:33 -0700 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-07-13 10:18:33 -0700 |
| commit | 71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (patch) | |
| tree | 3bb3e5e496621535611e087720aa5c4d7a533e5e /Dockerfile | |
| parent | 86ad4988fe7ff64916127509d84f44c56fa097aa (diff) | |
| parent | da1f05fbc19477c05c0c01bb07fabfaf1ece9d54 (diff) | |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile index 6bd5acb335..f15eb2ee36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ dfu-programmer \ dfu-util \ gcc \ - gcc-arm-none-eabi \ gcc-avr \ git \ libnewlib-arm-none-eabi \ @@ -19,11 +18,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ zip \ && rm -rf /var/lib/apt/lists/* -ENV KEYBOARD=ergodox_ez -ENV KEYMAP=default +# upgrade gcc-arm-none-eabi from the default 5.4.1 to 6.3.1 due to ARM runtime issues +RUN wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -O - | \ + tar xj --strip-components=1 -C / VOLUME /qmk_firmware WORKDIR /qmk_firmware COPY . . -CMD make $KEYBOARD:$KEYMAP +CMD make all:default |