[docker] add CI image and put images in paparazziuav organization

Automated builds on https://hub.docker.com/u/paparazziuav
This commit is contained in:
Felix Ruess
2018-09-23 18:03:27 +02:00
parent 5fe023ab34
commit 4fb98a3789
6 changed files with 37 additions and 32 deletions
+13 -10
View File
@@ -15,27 +15,30 @@ help:
@echo ""
build:
docker build --tag=flixr/pprz-dep dep/.
docker build --tag=flixr/pprz-dev dev/.
docker build --tag=paparazziuav/pprz-dep dep/.
docker build --tag=paparazziuav/pprz-dev dev/.
docker build --tag=paparazziuav/pprz-ci ci/.
pull:
docker pull flixr/pprz-dep
docker pull flixr/pprz-dev
docker pull paparazziuav/pprz-dep
docker pull paparazziuav/pprz-dev
docker pull paparazziuav/pprz-ci
remove_images:
docker rmi -f flixr/pprz-dep
docker rmi -f flixr/pprz-dev
docker rmi -f paparazziuav/pprz-dep
docker rmi -f paparazziuav/pprz-dev
docker rmi -f paparazziuav/pprz-ci
bash terminator:
@bash run.sh -i -t flixr/pprz-dev $@
@bash run.sh -i -t paparazziuav/pprz-dev $@
paparazzi:
@bash run.sh -i -t flixr/pprz-dev ./paparazzi
@bash run.sh -i -t paparazziuav/pprz-dev ./paparazzi
start:
@bash run.sh -i -t flixr/pprz-dev ./start.py
@bash run.sh -i -t paparazziuav/pprz-dev ./start.py
test:
@bash run.sh -i -t flixr/pprz-dev make test
@bash run.sh -i -t paparazziuav/pprz-dev make test
.PHONY: all help build pull remove_images bash terminator paparazzi start test
+9
View File
@@ -0,0 +1,9 @@
FROM paparazziuav/pprz-dep
LABEL maintainer="felix.ruess@gmail.com"
RUN sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
RUN wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
libgazebo7-dev \
&& rm -rf /var/lib/apt/lists/*
+6
View File
@@ -0,0 +1,6 @@
# pprz-ci
This is the CI image of the Paparazzi-UAV project.
It adds gazebo.
[Paparazzi-UAV](https://paparazziuav.org) is a free and open-source hardware and software project encompassing an exceptionally powerful and versatile autopilot system for fixedwing aircrafts as well as multicopters.
+3 -11
View File
@@ -1,11 +1,5 @@
#From inside this folder
# docker build -t flixr/pprz-dep .
# docker run -t -i flixr/pprz-dep /bin/bash
# docker export pprz-dep | gzip -c > pprz-dep.tgz
# docker import pprz-dep < pprz-dep.tgz
FROM ubuntu:16.04
MAINTAINER Felix Ruess <felix.ruess@gmail.com>
LABEL maintainer="felix.ruess@gmail.com"
# Add Tini
ENV TINI_VERSION v0.8.4
@@ -29,10 +23,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
paparazzi-dev \
paparazzi-jsbsim \
x11-apps \
gedit
# Clean up APT when done.
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
gedit \
&& rm -rf /var/lib/apt/lists/*
ENTRYPOINT ["/tini", "--"]
CMD ["bash"]
+4 -9
View File
@@ -1,17 +1,12 @@
#From inside this folder
# docker build -t flixr/pprz-dev .
# docker run -t -i flixr/pprz-dev /bin/bash
# run with X11 forwarding:
# sudo docker run -t -i -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix flixr/pprz-dev /bin/bash
FROM flixr/pprz-dep
MAINTAINER Felix Ruess <felix.ruess@gmail.com>
FROM paparazziuav/pprz-dep
LABEL maintainer="felix.ruess@gmail.com"
# install some extra convenience packages
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
light-themes \
terminator \
vim
vim \
&& rm -rf /var/lib/apt/lists/*
# Clean up APT when done.
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+2 -2
View File
@@ -4,7 +4,7 @@
# if no arguments given, start with interactive terminal
if test $# -lt 1; then
args="-t -i flixr/pprz-dev"
args="-t -i paparazziuav/pprz-dev"
else
# Use this script with derived images, and pass your 'docker run' args
args="$@"
@@ -75,7 +75,7 @@ fi
# use it if ENABLE_USB variable is non-empty/zero
if [ -n "$PRIVILEGED_USB" ]; then
echo "WARNING: running as priviliged container to enable complete USB access!"
echo "Better pass devices explicitly: ./run.sh -i -t --device=/dev/ttyUSB0 flixr/pprz-dev bash"
echo "Better pass devices explicitly: ./run.sh -i -t --device=/dev/ttyUSB0 paparazziuav/pprz-dev bash"
USB_OPTS="--privileged --volume=/dev/bus/usb:/dev/bus/usb"
fi