Update docker util script and travis to use new base container

diff --git a/.travis.yml b/.travis.yml
index b4a76765cc4cbacccfe548d8499cec1c90c3e0e4..52c8f50a868ee9d7e70205a2d48184bd4362533e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,6 @@ env:
   - MAKEFLAGS="-j3 --output-sync"
 services:
   - docker
-before_install:
-  - docker build -t qmkfm/qmk_firmware .
 install:
   - npm install -g moxygen
 script:

diff --git a/Dockerfile b/Dockerfile
index f15eb2ee3602c287d6c6e9b99ca4466d6effffe9..3f1f7530024499663ba7d66dd802864f1ef3be0f 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,4 @@
-FROM debian:9
-
-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 \
-    gcc-avr \
-    git \
-    libnewlib-arm-none-eabi \
-    software-properties-common \
-    unzip \
-    wget \
-    zip \
-    && rm -rf /var/lib/apt/lists/*
+FROM qmkfm/base_container
 
 # 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 - | \

diff --git a/util/docker_build.sh b/util/docker_build.sh
index c573ebcae2dcaf237739e7b4adbf6c8c01f3c522..6feeb1f5d26559f9f30c7e69b0e67baf6032cd9c 100755 (executable)
--- a/util/docker_build.sh
+++ b/util/docker_build.sh
@@ -46,5 +46,5 @@ fi
 dir=$(pwd -W 2>/dev/null) || dir=$PWD  # Use Windows path if on Windows
 
 # Run container and build firmware
-docker run --rm -it $usb_args -v "$dir":/qmk_firmware qmkfm/qmk_firmware \
+docker run --rm -it $usb_args -w /qmk_firmware/ -v "$dir":/qmk_firmware qmkfm/base_container \
        make "$keyboard${keymap:+:$keymap}${target:+:$target}"

diff --git a/util/travis_build.sh b/util/travis_build.sh
index 554ec8b689656b86b2b7066ec99d7678cdfd6e23..fd5511a72bab8b0f910e02da3333c3e097cef20e 100755 (executable)
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -3,7 +3,7 @@
 # if docker is installed - call make within the qmk docker image
 if command -v docker >/dev/null; then
   function make() {
-    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/qmk_firmware make "$@"
+    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
   }
 fi
 

diff --git a/util/travis_test.sh b/util/travis_test.sh
index 3be4afff7a4ae81b40c427b6fb666c476e30f6e6..e6a50ac1658e7a889d14ca2e4bb9fc503efc0b55 100644 (file)
--- a/util/travis_test.sh
+++ b/util/travis_test.sh
@@ -22,7 +22,7 @@ fi
 # if docker is installed - call make within the qmk docker image
 if command -v docker >/dev/null; then
   function make() {
-    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/qmk_firmware make "$@"
+    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
   }
 fi