From 711968900d3061688bac2c233c952daf27fc1bc5 Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Mon, 6 Sep 2021 16:14:23 -0400
Subject: [PATCH] Switched to borglab hub

---
 docker/ubuntu-boost-tbb/build.sh          | 4 ++--
 docker/ubuntu-gtsam-python-vnc/Dockerfile | 2 +-
 docker/ubuntu-gtsam-python-vnc/build.sh   | 4 ++--
 docker/ubuntu-gtsam-python-vnc/vnc.sh     | 2 +-
 docker/ubuntu-gtsam-python/Dockerfile     | 6 ++++--
 docker/ubuntu-gtsam-python/build.sh       | 4 ++--
 docker/ubuntu-gtsam/Dockerfile            | 2 +-
 docker/ubuntu-gtsam/build.sh              | 4 ++--
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/docker/ubuntu-boost-tbb/build.sh b/docker/ubuntu-boost-tbb/build.sh
index 2dac4c3db..ff465c970 100755
--- a/docker/ubuntu-boost-tbb/build.sh
+++ b/docker/ubuntu-boost-tbb/build.sh
@@ -1,3 +1,3 @@
 # Build command for Docker image
-# TODO(dellaert): use docker compose and/or cmake
-docker build --no-cache -t dellaert/ubuntu-boost-tbb:bionic .
+# TODO(borglab): use docker compose and/or cmake
+docker build --no-cache -t borglab/ubuntu-boost-tbb:bionic .
diff --git a/docker/ubuntu-gtsam-python-vnc/Dockerfile b/docker/ubuntu-gtsam-python-vnc/Dockerfile
index 61ecd9b9a..8039698c3 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 borglab/ubuntu-gtsam-python:bionic
 
 # Things needed to get a python GUI
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/docker/ubuntu-gtsam-python-vnc/build.sh b/docker/ubuntu-gtsam-python-vnc/build.sh
index 8d280252f..95d7dd575 100755
--- a/docker/ubuntu-gtsam-python-vnc/build.sh
+++ b/docker/ubuntu-gtsam-python-vnc/build.sh
@@ -1,4 +1,4 @@
 # Build command for Docker image
-# TODO(dellaert): use docker compose and/or cmake
+# TODO(borglab): use docker compose and/or cmake
 # Needs to be run in docker/ubuntu-gtsam-python-vnc directory
-docker build -t dellaert/ubuntu-gtsam-python-vnc:bionic .
+docker build -t borglab/ubuntu-gtsam-python-vnc:bionic .
diff --git a/docker/ubuntu-gtsam-python-vnc/vnc.sh b/docker/ubuntu-gtsam-python-vnc/vnc.sh
index c0ab692c6..b749093af 100755
--- a/docker/ubuntu-gtsam-python-vnc/vnc.sh
+++ b/docker/ubuntu-gtsam-python-vnc/vnc.sh
@@ -2,4 +2,4 @@
 docker run -it \
     --workdir="/usr/src/gtsam" \
     -p 5900:5900 \
-    dellaert/ubuntu-gtsam-python-vnc:bionic
\ No newline at end of file
+    borglab/ubuntu-gtsam-python-vnc:bionic
\ No newline at end of file
diff --git a/docker/ubuntu-gtsam-python/Dockerfile b/docker/ubuntu-gtsam-python/Dockerfile
index ce5d8fdca..85eed4d4e 100644
--- a/docker/ubuntu-gtsam-python/Dockerfile
+++ b/docker/ubuntu-gtsam-python/Dockerfile
@@ -1,7 +1,7 @@
 #  GTSAM Ubuntu image with Python wrapper support.
 
 # Get the base Ubuntu/GTSAM image from Docker Hub
-FROM dellaert/ubuntu-gtsam:bionic
+FROM borglab/ubuntu-gtsam:bionic
 
 # Install pip
 RUN apt-get install -y python3-pip python3-dev
@@ -22,7 +22,9 @@ RUN cmake \
     ..
 
 # Build again, as ubuntu-gtsam image cleaned
-RUN make -j4 install && make clean
+RUN make -j4 install
+RUN make python-install
+RUN make clean
 
 # Needed to run python wrapper:
 RUN echo 'export PYTHONPATH=/usr/local/python/:$PYTHONPATH' >> /root/.bashrc
diff --git a/docker/ubuntu-gtsam-python/build.sh b/docker/ubuntu-gtsam-python/build.sh
index 1696f6c61..367847ba5 100755
--- a/docker/ubuntu-gtsam-python/build.sh
+++ b/docker/ubuntu-gtsam-python/build.sh
@@ -1,3 +1,3 @@
 # Build command for Docker image
-# TODO(dellaert): use docker compose and/or cmake
-docker build --no-cache -t dellaert/ubuntu-gtsam-python:bionic .
+# TODO(borglab): use docker compose and/or cmake
+docker build --no-cache -t borglab/ubuntu-gtsam-python:bionic .
diff --git a/docker/ubuntu-gtsam/Dockerfile b/docker/ubuntu-gtsam/Dockerfile
index f2b476f15..ce6927fe8 100644
--- a/docker/ubuntu-gtsam/Dockerfile
+++ b/docker/ubuntu-gtsam/Dockerfile
@@ -1,7 +1,7 @@
 # Ubuntu image with GTSAM installed. Configured with  Boost and TBB support.
 
 # Get the base Ubuntu image from Docker Hub
-FROM dellaert/ubuntu-boost-tbb:bionic
+FROM borglab/ubuntu-boost-tbb:bionic
 
 # Install git
 RUN apt-get update && \
diff --git a/docker/ubuntu-gtsam/build.sh b/docker/ubuntu-gtsam/build.sh
index bf545e9c2..24a7d4f7f 100755
--- a/docker/ubuntu-gtsam/build.sh
+++ b/docker/ubuntu-gtsam/build.sh
@@ -1,3 +1,3 @@
 # Build command for Docker image
-# TODO(dellaert): use docker compose and/or cmake
-docker build --no-cache -t dellaert/ubuntu-gtsam:bionic .
+# TODO(borglab): use docker compose and/or cmake
+docker build --no-cache -t borglab/ubuntu-gtsam:bionic .