From 4e3f7a07fbf1fc217bb7e413d2e2648a089691c6 Mon Sep 17 00:00:00 2001 From: Andy Date: Tue, 17 Oct 2017 22:07:58 -0700 Subject: [PATCH] Updated local docker toolchain --- Dockerfile | 24 +++++++++++++++++------- build.sh | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd18365e4..47fafb35a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,22 @@ -FROM ubuntu:wily -LABEL maintainer Alexandr Kuzmitsky +FROM ubuntu:xenial +LABEL maintainer Andy Schwarz +# Configuration VOLUME /home/src/ WORKDIR /home/src/ -RUN mkdir -p /home/src && apt-get update && \ - apt-get install -y software-properties-common python-software-properties && \ - apt-get remove -y binutils-arm-none-eabi gcc-arm-none-eabi && \ - add-apt-repository -y ppa:terry.guo/gcc-arm-embedded && \ +# Essentials +RUN mkdir -p /home/src && \ apt-get update && \ - apt-get install -y gcc-arm-none-eabi libnewlib-arm-none-eabi make git gcc ruby \ No newline at end of file + apt-get install -y software-properties-common python-software-properties ruby make git gcc wget curl bzip2 lib32ncurses5 lib32z1 + +# Toolchain +ENV TOOLCHAIN= +ENV TOOLCHAIN_ID= +RUN wget -P /tmp https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 +RUN mkdir -p /opt && \ + cd /opt && \ + tar xvjf /tmp/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -C /opt && \ + chmod -R -w /opt/gcc-arm-none-eabi-6-2017-q2-update + +ENV PATH="/opt/gcc-arm-none-eabi-6-2017-q2-update/bin:${PATH}" \ No newline at end of file diff --git a/build.sh b/build.sh index c554375c3..f14fc2a97 100755 --- a/build.sh +++ b/build.sh @@ -1,2 +1,2 @@ echo "Building target" $1 -docker run --rm -v `pwd`:/home/src/ inav make TARGET=$1 \ No newline at end of file +docker run --rm -v `pwd`:/home/src/ flyandi/docker-inav make TARGET=$1 \ No newline at end of file