Skip to content

Some progress towards a 64-bit docker container #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
g-oikonomou wants to merge 9 commits into
base: contrib/docker64
Choose a base branch
from
Open

Some progress towards a 64-bit docker container #11

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7e46737
Do not build renode - speed up testing
g-oikonomou Nov 24, 2019
0f1d4fa
Set java alternative before setting JAVA_HOME
g-oikonomou Nov 24, 2019
b63ba84
Don't install mono and don't suppress apt output
g-oikonomou Nov 24, 2019
760fc01
Be explicit in terms of the JDK version on apt
g-oikonomou Nov 24, 2019
6fbd4ed
Remove some apt packages
g-oikonomou Nov 24, 2019
8ff99a2
Set JAVA_HOME correctly
g-oikonomou Nov 24, 2019
1f8d309
Install 32-bit support for the msp430 and jn516x toolchains
g-oikonomou Nov 24, 2019
5a435b7
Deploy arm-gcc from developer.arm.com
g-oikonomou Nov 24, 2019
9f1c2ec
Substitute apt for apt-get
g-oikonomou Nov 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 15 additions & 28 deletions tools/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,52 +10,41 @@ RUN apt-get -qq update \
&& apt-get -qq -y --no-install-recommends install apt-utils gnupg > /dev/null \
&& apt-get -qq clean

RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
echo "deb http://download.mono-project.com/repo/ubuntu bionic main" | tee /etc/apt/sources.list.d/mono-xamarin.list && \
apt-get -qq update && \
apt-get -qq -y --no-install-recommends install \
RUN apt-get update && apt-get -y --no-install-recommends install \
ant \
build-essential \
default-jdk \
doxygen \
gdb \
git \
gtk-sharp2 \
iputils-tracepath \
iputils-ping \
libcanberra-gtk-module \
libgtk2.0-0 \
mono-complete \
mosquitto \
mosquitto-clients \
net-tools \
npm \
openjdk-8-jdk \
openjdk-11-jdk \
python-pip \
python-serial \
rlwrap \
sudo \
screen \
srecord \
software-properties-common \
uml-utilities \
unzip \
valgrind \
wget \
smitools \
snmp \
snmp-mibs-downloader \
> /dev/null \
&& apt-get -qq clean

# Install coap-cli
RUN npm -q install [email protected] -g

# Install ARM toolchain
RUN add-apt-repository ppa:team-gcc-arm-embedded/ppa
RUN apt-get update \
&& apt-get -y install 'gcc-arm-embedded=7-2018q2-1~bionic*' \
&& apt-get -qq clean
RUN wget -nv https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 && \
tar xjf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 -C /tmp/ && \
cp -f -r /tmp/gcc-arm-none-eabi-9-2019-q4-major/* /usr/local/ && \
rm -rf /tmp/gcc-arm-none-eabi-* gcc-arm-none-eabi-*-linux.tar.bz2

# Install msp430 toolchain
RUN wget -nv http://simonduq.github.io/resources/mspgcc-4.7.2-compiled.tar.bz2 && \
Expand Down Expand Up @@ -101,11 +90,19 @@ RUN export uid=1000 gid=1000 && \
chown ${uid}:${gid} -R /home/user && \
usermod -aG dialout user

# Set java 11 for Cooja
RUN update-java-alternatives --set /usr/lib/jvm/java-1.11.0-openjdk-amd64

# Install 32-bit support for the msp430 and jn516x toolchains
RUN dpkg --add-architecture i386 && \
apt-get update && \
apt-get install -y --no-install-recommends libc6:i386 zlib1g:i386

# Set user for what comes next
USER user

# Environment variables
ENV JAVA_HOME /usr/lib/jvm/default-java
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
ENV HOME /home/user
ENV CONTIKI_NG ${HOME}/contiki-ng
ENV COOJA ${CONTIKI_NG}/tools/cooja
Expand All @@ -116,16 +113,6 @@ WORKDIR ${HOME}
RUN echo "#!/bin/bash\nant -Dbasedir=${COOJA} -f ${COOJA}/build.xml run" > ${HOME}/cooja && \
chmod +x ${HOME}/cooja

# Set java 11 for Cooja
RUN sudo update-java-alternatives --set /usr/lib/jvm/java-1.11.0-openjdk-amd64

# Download, build and install Renode
RUN git clone --quiet https://github.com/renode/renode.git \
&& cd ${HOME}/renode \
&& git checkout v1.3 \
&& ./build.sh
ENV PATH="${HOME}/renode:${PATH}"

# By default, we use a Docker bind mount to share the repo with the host,
# with Docker run option:
# -v <HOST_CONTIKI_NG_ABS_PATH>:/home/user/contiki-ng
Expand Down