From e4d820b11e9f592b3edea1787470666f00b2b4fd Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 30 Mar 2016 18:42:36 +0200 Subject: [PATCH] Dockerfile cosmetics --- radio/util/Dockerfile | 55 ++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/radio/util/Dockerfile b/radio/util/Dockerfile index 9d095ef72..aa4c1d4cb 100644 --- a/radio/util/Dockerfile +++ b/radio/util/Dockerfile @@ -1,33 +1,34 @@ # An Debian image for compiling OpenTX 2.2 -FROM debian:jessie -MAINTAINER bsongis +FROM debian:jessie -RUN apt-get update && apt-get install -y \ - software-properties-common \ - wget \ - lib32z1 \ - lib32ncurses5 \ - git \ - cmake \ - gcc \ - avr-libc \ - build-essential \ - libfox-1.6-dev \ - python-qt4 \ - qt5-default \ - qttools5-dev \ - qtmultimedia5-dev \ - qttools5-dev-tools \ - libsdl1.2-dev +RUN apt-get update && \ + apt-get install -y \ + avr-libc \ + build-essential \ + cmake \ + gcc \ + git \ + lib32ncurses5 \ + lib32z1 \ + libfox-1.6-dev \ + libsdl1.2-dev \ + python-qt4 \ + qt5-default \ + qtmultimedia5-dev \ + qttools5-dev \ + qttools5-dev-tools \ + software-properties-common \ + wget -RUN wget -q https://launchpad.net/gcc-arm-embedded/4.7/4.7-2013-q3-update/+download/gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2 && \ - tar xjf gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2 && \ - mv gcc-arm-none-eabi-4_7-2013q3 /opt/gcc-arm-none-eabi +RUN wget -q https://launchpad.net/gcc-arm-embedded/4.7/4.7-2013-q3-update/+download/gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2 && \ + tar xjf gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2 && \ + mv gcc-arm-none-eabi-4_7-2013q3 /opt/gcc-arm-none-eabi -RUN wget -q http://ftp.de.debian.org/debian/pool/main/g/gcc-avr/gcc-avr_4.7.2-2_amd64.deb && \ - wget -q http://ftp.de.debian.org/debian/pool/main/m/mpclib/libmpc2_0.9-4_amd64.deb && \ - dpkg -i gcc-avr_4.7.2-2_amd64.deb libmpc2_0.9-4_amd64.deb +RUN wget -q http://ftp.de.debian.org/debian/pool/main/g/gcc-avr/gcc-avr_4.7.2-2_amd64.deb && \ + wget -q http://ftp.de.debian.org/debian/pool/main/m/mpclib/libmpc2_0.9-4_amd64.deb && \ + dpkg -i gcc-avr_4.7.2-2_amd64.deb libmpc2_0.9-4_amd64.deb -VOLUME ["/opentx"] -ENV PATH $PATH:/opt/gcc-arm-none-eabi/bin:/opentx/code/radio/util +VOLUME ["/opentx"] + +ENV PATH $PATH:/opt/gcc-arm-none-eabi/bin:/opentx/code/radio/util