From 45c4f2246f1139f29b48ba947949f5f81bc58b72 Mon Sep 17 00:00:00 2001
From: Hyunggi Chang <hyunggi.chang@stradvision.com>
Date: Mon, 9 Oct 2023 22:38:48 +0900
Subject: [PATCH] update dockerfile for cpp and 3d poses

---
 1_7/Dockerfile |  4 ++--
 2_2/Dockerfile | 36 +++---------------------------------
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/1_7/Dockerfile b/1_7/Dockerfile
index 8be71f3..9a976b3 100644
--- a/1_7/Dockerfile
+++ b/1_7/Dockerfile
@@ -5,5 +5,5 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 RUN cd fastcampus_slam_codes/1_7 &&\
     mkdir build && cd build &&\
-    cmake .. &&\
-    make -j
+    cmake -GNinja .. &&\
+    ninja -j4
diff --git a/2_2/Dockerfile b/2_2/Dockerfile
index a4855e2..8dbf4c8 100644
--- a/2_2/Dockerfile
+++ b/2_2/Dockerfile
@@ -1,37 +1,7 @@
-FROM ubuntu:jammy
+FROM slam:latest
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata && \
-  apt-get install -y \
-  sudo \
-  unzip \
-  cmake \
-  wget \
-  build-essential \
-  ninja-build \
-  libglew-dev \
-  libglvnd-dev \
-  libgl1-mesa-dev \
-  libegl1-mesa-dev \
-  git \
-  libjpeg-dev \
-  libpng-dev \
-  libtiff-dev \
-  libeigen3-dev
-
-# Pangolin
-
-RUN cd / && \
-    wget https://github.com/stevenlovegrove/Pangolin/archive/refs/tags/v0.6.zip &&\
-    unzip v0.6.zip && \
-    mkdir build && \
-    cd build &&\
-    cmake -DCMAKE_BUILD_TYPE=Release -GNinja ../Pangolin-0.6 &&\
-    ninja -j4 && \
-    ninja install
-
-RUN git clone https://github.com/changh95/fastcampus_slam_codes.git && \
-    cd fastcampus_slam_codes/2_2.3d_회전과_이동 &&\
+RUN cd fastcampus_slam_codes/2_2.3d_회전과_이동 &&\
     mkdir build && cd build && \
     cmake -GNinja ../ && \
-    ninja
+    ninja -j4