From 8b66960a42d30cb8dfb0e3a7be08e76f9fcfec30 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Tue, 2 Jun 2020 17:02:14 -0500 Subject: [PATCH] small logistical fixes --- docker/ubuntu-gtsam-python-vnc/Dockerfile | 2 +- docker/ubuntu-gtsam-python/Dockerfile | 4 ++-- docker/ubuntu-gtsam/Dockerfile | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/ubuntu-gtsam-python-vnc/Dockerfile b/docker/ubuntu-gtsam-python-vnc/Dockerfile index 8b6b97f46..26f995c56 100644 --- a/docker/ubuntu-gtsam-python-vnc/Dockerfile +++ b/docker/ubuntu-gtsam-python-vnc/Dockerfile @@ -1,7 +1,7 @@ # This GTSAM image connects to the host X-server via VNC to provide a Graphical User Interface for interaction. # Get the base Ubuntu/GTSAM image from Docker Hub -FROM dellaert/ubuntu-gtsam-python:bionic +FROM dellaert/ubuntu-gtsam-python:latest # Things needed to get a python GUI ENV DEBIAN_FRONTEND noninteractive diff --git a/docker/ubuntu-gtsam-python/Dockerfile b/docker/ubuntu-gtsam-python/Dockerfile index a9a9782f4..71787d480 100644 --- a/docker/ubuntu-gtsam-python/Dockerfile +++ b/docker/ubuntu-gtsam-python/Dockerfile @@ -7,7 +7,7 @@ FROM dellaert/ubuntu-gtsam:latest RUN apt-get install -y python3-pip python3-dev # Install python wrapper requirements -RUN pip3 install -U -r /usr/src/gtsam/cython/requirements.txt +RUN python3 -m pip install -U -r /usr/src/gtsam/cython/requirements.txt # Run cmake again, now with cython toolbox on WORKDIR /usr/src/gtsam/build @@ -22,7 +22,7 @@ RUN cmake \ .. # Build again, as ubuntu-gtsam image cleaned -RUN make -j3 install && make clean +RUN make -j4 install && make clean # Needed to run python wrapper: RUN echo 'export PYTHONPATH=/usr/local/cython/:$PYTHONPATH' >> /root/.bashrc diff --git a/docker/ubuntu-gtsam/Dockerfile b/docker/ubuntu-gtsam/Dockerfile index c09d4b16a..393443361 100644 --- a/docker/ubuntu-gtsam/Dockerfile +++ b/docker/ubuntu-gtsam/Dockerfile @@ -10,13 +10,13 @@ RUN apt-get update && \ # Install compiler RUN apt-get install -y build-essential -# Clone GTSAM +# Clone GTSAM (develop branch) WORKDIR /usr/src/ -RUN git clone https://bitbucket.org/gtborg/gtsam.git -RUN mkdir build +RUN git clone --single-branch --branch develop https://github.com/borglab/gtsam.git -# Run cmake +# Change to build directory. Will be created automatically. WORKDIR /usr/src/gtsam/build +# Run cmake RUN cmake \ -DCMAKE_BUILD_TYPE=Release \ -DGTSAM_WITH_EIGEN_MKL=OFF \