diff --git a/docker/Dockerfile_base-archlinux b/docker/Dockerfile_base-archlinux index d4276f88..0794690d 100644 --- a/docker/Dockerfile_base-archlinux +++ b/docker/Dockerfile_base-archlinux @@ -5,7 +5,7 @@ FROM archlinux/base:latest LABEL maintainer="Julien Lecoeur " -RUN pacman -Sy --noconfirm \ +RUN pacman -Sy --noconfirm \ arm-none-eabi-gcc \ arm-none-eabi-newlib \ base-devel \ @@ -18,6 +18,7 @@ RUN pacman -Sy --noconfirm \ nettle \ ninja \ python-pip \ + python-setuptools \ tar \ unzip \ vim \ @@ -25,23 +26,19 @@ RUN pacman -Sy --noconfirm \ zip # Install python dependencies -RUN pip install \ - cerberus \ - empy \ - jinja2 \ - numpy \ - pyyaml \ - serial \ - toml +RUN python3 -m pip install --upgrade pip \ + && pip3 install argparse argcomplete coverage cerberus empy jinja2 \ + matplotlib==3.0.* numpy pkgconfig pyulog pyyaml requests serial \ + toml pyulog wheel # Install genromfs -RUN wget https://sourceforge.net/projects/romfs/files/genromfs/0.5.2/genromfs-0.5.2.tar.gz \ +RUN wget https://sourceforge.net/projects/romfs/files/genromfs/0.5.2/genromfs-0.5.2.tar.gz \ && tar zxvf genromfs-0.5.2.tar.gz \ && cd genromfs-0.5.2 && make && make install && cd .. \ && rm genromfs-0.5.2.tar.gz genromfs-0.5.2 -r # Install gosu -RUN curl -sSL https://github.com/tianon/gosu/releases/download/1.8/gosu-amd64 > /usr/sbin/gosu \ +RUN curl -sSL https://github.com/tianon/gosu/releases/download/1.8/gosu-amd64 > /usr/sbin/gosu \ && chmod +x /usr/sbin/gosu # Gradle (Required to build Fast-RTPS-Gen) @@ -70,10 +67,10 @@ RUN git clone --recursive https://github.com/eProsima/Fast-RTPS-Gen.git -b v1.0. && rm -rf /tmp/* # Add group dialout -RUN groupadd dialout +RUN groupadd dialout # manual ccache setup -RUN ln -s /usr/bin/ccache /usr/lib/ccache/bin/arm-none-eabi-gcc \ +RUN ln -s /usr/bin/ccache /usr/lib/ccache/bin/arm-none-eabi-gcc \ && ln -s /usr/bin/ccache /usr/lib/ccache/bin/arm-none-eabi-g++ ENV CCACHE_MAXSIZE=1G diff --git a/docker/Dockerfile_base-bionic b/docker/Dockerfile_base-bionic index 6c6dfa05..dd72494b 100644 --- a/docker/Dockerfile_base-bionic +++ b/docker/Dockerfile_base-bionic @@ -35,9 +35,9 @@ RUN apt-get update && apt-get -y --quiet --no-install-recommends install \ openjdk-8-jre \ openssh-client \ pkg-config \ - python-pip \ - python-pygments \ - python-setuptools \ + python3-pip \ + python3-pygments \ + python3-setuptools \ rsync \ shellcheck \ tzdata \ @@ -56,9 +56,11 @@ RUN cd /usr/src/gtest \ && cp *.a /usr/lib \ && cd .. && rm -rf build -RUN python -m pip install --upgrade pip \ - && pip install setuptools pkgconfig wheel \ - && pip install argparse argcomplete coverage jinja2 empy numpy requests serial toml pyyaml cerberus +# python3 dependencies installed by pip +RUN python3 -m pip install --upgrade pip \ + && pip3 install argparse argcomplete coverage cerberus empy jinja2 \ + matplotlib==3.0.* numpy pkgconfig pyulog pyyaml requests serial \ + toml pyulog wheel # manual ccache setup RUN ln -s /usr/bin/ccache /usr/lib/ccache/cc \ diff --git a/docker/Dockerfile_base-xenial b/docker/Dockerfile_base-xenial index a99d7b2f..91f3f815 100644 --- a/docker/Dockerfile_base-xenial +++ b/docker/Dockerfile_base-xenial @@ -35,9 +35,9 @@ RUN apt-get update && apt-get -y --quiet --no-install-recommends install \ openjdk-8-jre \ openssh-client \ pkg-config \ - python-pip \ - python-pygments \ - python-setuptools \ + python3-pip \ + python3-pygments \ + python3-setuptools \ rsync \ shellcheck \ tzdata \ @@ -56,9 +56,11 @@ RUN cd /usr/src/gtest \ && cp *.a /usr/lib \ && cd .. && rm -rf build -RUN python -m pip install --upgrade pip \ - && pip install setuptools pkgconfig wheel \ - && pip install argparse argcomplete coverage jinja2 empy numpy requests serial toml pyyaml cerberus +# python3 dependencies installed by pip +RUN python3 -m pip install --upgrade pip \ + && pip3 install argparse argcomplete coverage cerberus empy jinja2 \ + matplotlib==3.0.* numpy pkgconfig pyulog pyyaml requests serial \ + toml pyulog wheel # manual ccache setup RUN ln -s /usr/bin/ccache /usr/lib/ccache/cc \ diff --git a/docker/Dockerfile_ros-kinetic b/docker/Dockerfile_ros-kinetic index 25c6662d..fcd0b696 100644 --- a/docker/Dockerfile_ros-kinetic +++ b/docker/Dockerfile_ros-kinetic @@ -22,7 +22,6 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key C1CF6E31E6B protobuf-compiler \ python-catkin-tools \ python-tk \ - python3-pip \ ros-$ROS_DISTRO-gazebo-ros-pkgs \ ros-$ROS_DISTRO-mavlink \ ros-$ROS_DISTRO-mavros \ @@ -38,10 +37,8 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key C1CF6E31E6B && geographiclib-get-geoids egm96-5 \ && apt-get -y autoremove \ && apt-get clean autoclean \ - # pip + # pip2 && pip install px4tools pymavlink \ - && pip3 install setuptools wheel \ - && pip3 install pyulog matplotlib==3.0.* \ && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/* RUN rosdep init && rosdep update diff --git a/docker/Dockerfile_ros-melodic b/docker/Dockerfile_ros-melodic index 317cfac9..062a62c6 100644 --- a/docker/Dockerfile_ros-melodic +++ b/docker/Dockerfile_ros-melodic @@ -19,7 +19,6 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key C1CF6E31E6B libopencv-dev \ python-catkin-tools \ python-tk \ - python3-pip \ ros-$ROS_DISTRO-gazebo-ros-pkgs \ ros-$ROS_DISTRO-mavlink \ ros-$ROS_DISTRO-mavros \ @@ -35,10 +34,8 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key C1CF6E31E6B && geographiclib-get-geoids egm96-5 \ && apt-get -y autoremove \ && apt-get clean autoclean \ - # pip + # pip2 && pip install px4tools pymavlink \ - && pip3 install setuptools wheel \ - && pip3 install pyulog matplotlib==3.0.* \ && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/* RUN rosdep init && rosdep update diff --git a/docker/Dockerfile_simulation-bionic b/docker/Dockerfile_simulation-bionic index 508dec4e..c2ffa249 100644 --- a/docker/Dockerfile_simulation-bionic +++ b/docker/Dockerfile_simulation-bionic @@ -21,7 +21,6 @@ RUN wget --quiet http://packages.osrfoundation.org/gazebo.key -O - | apt-key add libimage-exiftool-perl \ libopencv-dev \ libxml2-utils \ - pkg-config \ protobuf-compiler \ && apt-get -y autoremove \ && apt-get clean autoclean \ diff --git a/docker/Dockerfile_simulation-xenial b/docker/Dockerfile_simulation-xenial index bae1ad9f..9c8a67ac 100644 --- a/docker/Dockerfile_simulation-xenial +++ b/docker/Dockerfile_simulation-xenial @@ -21,7 +21,6 @@ RUN wget --quiet http://packages.osrfoundation.org/gazebo.key -O - | apt-key add libimage-exiftool-perl \ libopencv-dev \ libxml2-utils \ - pkg-config \ protobuf-compiler \ && apt-get -y autoremove \ && apt-get clean autoclean \