From ba6b3fc1b55df7bb3e34721d2622837b394862a5 Mon Sep 17 00:00:00 2001
From: zvecr <git@zvecr.com>
Date: Thu, 17 Jan 2019 17:08:23 +0000
Subject: Use qmk docker image for travis CI builds

---
 Dockerfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 6bd5acb335..dc9d96ecd8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,11 +19,8 @@ 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
-
 VOLUME /qmk_firmware
 WORKDIR /qmk_firmware
 COPY . .
 
-CMD make $KEYBOARD:$KEYMAP
+CMD make all:default
-- 
cgit v1.2.3


From 91849853ba231f663731010ad073cdc85d23ae9b Mon Sep 17 00:00:00 2001
From: zvecr <git@zvecr.com>
Date: Sat, 1 Jun 2019 03:36:01 +0100
Subject: upgrade gcc-arm-none-eabi from the default 5.4.1 to 6.3.1 due to ARM
 runtime issues

---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index dc9d96ecd8..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,6 +18,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     zip \
     && 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 /
+
 VOLUME /qmk_firmware
 WORKDIR /qmk_firmware
 COPY . .
-- 
cgit v1.2.3