Update docker util script and travis to use new base container

[qmk_firmware.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index bc0285a447b146801249bc134c11013c7ef2c862..3f1f7530024499663ba7d66dd802864f1ef3be0f 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,11 @@
-FROM debian:jessie
-MAINTAINER Erik Dasque <erik@frenchguys.com>
+FROM qmkfm/base_container
 
-RUN apt-get update && apt-get install --no-install-recommends -y build-essential \
-    gcc \
-    unzip \
-    wget \
-    zip \
-    gcc-avr \
-    binutils-avr \
-    avr-libc \
-    dfu-programmer \
-    dfu-util \
-    gcc-arm-none-eabi \
-    binutils-arm-none-eabi \
-    libnewlib-arm-none-eabi \
-    git \
-    software-properties-common \
-    avrdude \
-    && 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;
+CMD make all:default