X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Dockerfile;h=f15eb2ee3602c287d6c6e9b99ca4466d6effffe9;hb=e717dcaa09143615ae0b46bf625621f67a7b55ce;hp=744ded85797c435cee7494d8bfa67e6691c2bf28;hpb=198a2929ed021eee3a909914fa520ab5b1a357a9;p=qmk_firmware.git

diff --git a/Dockerfile b/Dockerfile
index 744ded857..f15eb2ee3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,29 @@
-FROM debian:jessie
-MAINTAINER Erik Dasque <erik@frenchguys.com>
+FROM debian:9
 
-RUN apt-get update
-RUN apt-get install --no-install-recommends -y build-essential \
-    gcc \
-    unzip \
-    wget \
-    zip \
-    gcc-avr \
-    binutils-avr \
+RUN apt-get update && apt-get install --no-install-recommends -y \
     avr-libc \
+    avrdude \
+    binutils-arm-none-eabi \
+    binutils-avr \
+    build-essential \
     dfu-programmer \
     dfu-util \
-    gcc-arm-none-eabi \
-    binutils-arm-none-eabi \
+    gcc \
+    gcc-avr \
+    git \
     libnewlib-arm-none-eabi \
-    git
+    software-properties-common \
+    unzip \
+    wget \
+    zip \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN apt-get clean
-RUN rm -rf /var/lib/apt/lists/*
+# 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 /
 
-ENV keyboard=ergodox
-ENV subproject=ez
-ENV keymap=default
+VOLUME /qmk_firmware
+WORKDIR /qmk_firmware
+COPY . .
 
-VOLUME /qmk
-WORKDIR /qmk
-CMD make clean ; make keyboard=${keyboard} subproject=${subproject} keymap=${keymap}
+CMD make all:default