Update docker util script and travis to use new base container

master
zvecr 2019-06-05 01:17:01 +01:00 committed by skullydazed
parent 21fc6be41b
commit 0a03f7cff7
5 changed files with 4 additions and 24 deletions

View File

@ -13,8 +13,6 @@ env:
- MAKEFLAGS="-j3 --output-sync" - MAKEFLAGS="-j3 --output-sync"
services: services:
- docker - docker
before_install:
- docker build -t qmkfm/qmk_firmware .
install: install:
- npm install -g moxygen - npm install -g moxygen
script: script:

View File

@ -1,22 +1,4 @@
FROM debian:9 FROM qmkfm/base_container
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/*
# upgrade gcc-arm-none-eabi from the default 5.4.1 to 6.3.1 due to ARM runtime issues # 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 - | \ 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 - | \

View File

@ -46,5 +46,5 @@ fi
dir=$(pwd -W 2>/dev/null) || dir=$PWD # Use Windows path if on Windows dir=$(pwd -W 2>/dev/null) || dir=$PWD # Use Windows path if on Windows
# Run container and build firmware # 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}" make "$keyboard${keymap:+:$keymap}${target:+:$target}"

View File

@ -3,7 +3,7 @@
# if docker is installed - call make within the qmk docker image # if docker is installed - call make within the qmk docker image
if command -v docker >/dev/null; then if command -v docker >/dev/null; then
function make() { 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 fi

View File

@ -22,7 +22,7 @@ fi
# if docker is installed - call make within the qmk docker image # if docker is installed - call make within the qmk docker image
if command -v docker >/dev/null; then if command -v docker >/dev/null; then
function make() { 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 fi