diff --git a/docker/Makefile b/docker/Makefile index 271ac50ab1..5e266eb91c 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -8,7 +8,9 @@ help: @echo " 1. make pull - pull all pprz images" @echo " 1. make clean - remove all pprz images" @echo " 2. make bash - run bash on pprz-dev" - @echo " 2. make paparazzi - run paparazzi center on pprz-dev" + @echo " 2. make terminator - run terminator on pprz-dev" + @echo " 2. make paparazzi - run ./paparazzi center on pprz-dev" + @echo " 2. make start - run ./start.py on pprz-dev" @echo "" build: @@ -23,8 +25,11 @@ clean: @docker rmi -f flixr/pprz-dep @docker rmi -f flixr/pprz-dev -bash: - @bash run.sh -i -t flixr/pprz-dev bash +bash terminator: + @bash run.sh -i -t flixr/pprz-dev $@ paparazzi: @bash run.sh -i -t flixr/pprz-dev ./paparazzi + +start: + @bash run.sh -i -t flixr/pprz-dev ./start.py diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 754989b83d..1df37ac9f2 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -7,6 +7,16 @@ FROM flixr/pprz-dep MAINTAINER Felix Ruess +# Set the env variable DEBIAN_FRONTEND to noninteractive +ENV DEBIAN_FRONTEND noninteractive + +# install some extra convenience packages +RUN apt-get update && apt-get install -y \ + terminator + +# Clean up APT when done. +RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + ENV PULSE_SERVER /run/pulse/native # add basic user