aboutsummaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorzvecr <git@zvecr.com>2019-06-05 01:17:01 +0100
committerskullydazed <skullydazed@users.noreply.github.com>2019-07-14 21:01:38 -0700
commit0a03f7cff7b6892ca93333fa5061c1ca454de0cb (patch)
treeed536454985c9fc4a78e43781bcacce9f163d627 /Dockerfile
parent21fc6be41bd2a72ad52b00db8c9386e17bacd87f (diff)
downloadqmk_firmware-0a03f7cff7b6892ca93333fa5061c1ca454de0cb.tar.gz
qmk_firmware-0a03f7cff7b6892ca93333fa5061c1ca454de0cb.zip
Update docker util script and travis to use new base container
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile20
1 files changed, 1 insertions, 19 deletions
diff --git a/Dockerfile b/Dockerfile
index f15eb2ee3..3f1f75300 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,4 @@
1FROM debian:9 1FROM qmkfm/base_container
2
3RUN apt-get update && apt-get install --no-install-recommends -y \
4 avr-libc \
5 avrdude \
6 binutils-arm-none-eabi \
7 binutils-avr \
8 build-essential \
9 dfu-programmer \
10 dfu-util \
11 gcc \
12 gcc-avr \
13 git \
14 libnewlib-arm-none-eabi \
15 software-properties-common \
16 unzip \
17 wget \
18 zip \
19 && rm -rf /var/lib/apt/lists/*
20 2
21# upgrade gcc-arm-none-eabi from the default 5.4.1 to 6.3.1 due to ARM runtime issues 3# upgrade gcc-arm-none-eabi from the default 5.4.1 to 6.3.1 due to ARM runtime issues
22RUN 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 - | \ 4RUN 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 - | \