From bf11c827b0658133e3adb490c9eba95462c11373 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Sun, 27 May 2018 07:16:27 -0700 Subject: [PATCH] Docker: by default, build non-standalone image (contiki-ng as a mount) --- tools/docker/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index be28bf682..e1d85d003 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -88,12 +88,12 @@ RUN git clone https://github.com/renode/renode.git \ && ./build.sh ENV PATH="${HOME}/renode:${PATH}" -# Optional: download Contiki-NG and pre-compile Cooja. -# Else, use a Docker bind mount to share the repo with the host. -# Docker run option: +# By default, we use a Docker bind mount to share the repo with the host, +# with Docker run option: # -v :/home/user/contiki-ng -RUN git clone --recursive https://github.com/contiki-ng/contiki-ng.git ${CONTIKI_NG} -RUN ant -q -f ${CONTIKI_NG}/tools/cooja/build.xml jar +# Alternatively, uncomment the next two lines to download Contiki-NG and pre-compile Cooja. +#RUN git clone --recursive https://github.com/contiki-ng/contiki-ng.git ${CONTIKI_NG} +#RUN ant -q -f ${CONTIKI_NG}/tools/cooja/build.xml jar # Working directory WORKDIR ${CONTIKI_NG}