From 06e1174f6591f11e0fd1b375bebae6284dca2e1f Mon Sep 17 00:00:00 2001
From: AnielAlexa <139551403+AnielAlexa@users.noreply.github.com>
Date: Tue, 9 Jul 2024 13:32:12 +0300
Subject: [PATCH] Update Dockerfile

---
 Dockerfile | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9ddb8cf3..5b159ed0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,36 @@
-# Base Image
-#FROM nvidia/cuda:12.1.1-devel-ubuntu22.04
-FROM dustynv/l4t-pytorch:r36.2.0
+# Use ARG to set default values for base image and PyTorch installation command
+ARG BASE_IMAGE=amd
+ARG USER
+ARG UID
+ARG HOME
+ARG WORKSPACE
+ARG SHELL
+ARG CONTAINER_NAME
+ARG TIMEZONE=Etc/UTC
+
+# Use conditionals to choose the base image
+FROM nvidia/cuda:12.1.1-devel-ubuntu22.04 as amd
+FROM dustynv/l4t-pytorch:r36.2.0 as arm
+
+# Select the appropriate stage based on the BASE_IMAGE argument
+FROM ${BASE_IMAGE}
 
 # Arguments
-ARG user
-ARG uid
-ARG home
-ARG workspace
-ARG shell
-ARG container_name
-ARG timezone=Etc/UTC
+ARG USER
+ARG UID
+ARG HOME
+ARG WORKSPACE
+ARG SHELL
+ARG CONTAINER_NAME
+ARG TIMEZONE
 
 # Environment Variables for noninteractive installation and timezone
 ENV DEBIAN_FRONTEND=noninteractive
-ENV TZ=${timezone}
+ENV TZ=${TIMEZONE}
 
 # Update and Install Essential Packages
 RUN apt-get update && apt-get -y install --no-install-recommends \
-    tzdata  apt-utils keyboard-configuration git curl wget ca-certificates screen tree sudo ssh synaptic aptitude gedit geany mesa-utils cmake build-essential python3-pip \
+    tzdata apt-utils keyboard-configuration git curl wget ca-certificates screen tree sudo ssh synaptic aptitude gedit geany mesa-utils cmake build-essential python3-pip \
     libqt5widgets5 libqt5gui5 libqt5core5a libxcb-xinerama0 libfontconfig1 libxrender1 libx11-6 libxcb1 libxext6 libx11-xcb1 libxi6 libxrandr2 libgl1-mesa-glx libdbus-1-3 x11-apps librsvg2-common
 
 # Symbolic link for Python
@@ -27,7 +40,10 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
 RUN pip install --upgrade pip && \
     pip install matplotlib numpy kornia tqdm pyyaml termcolor scipy
 
-#RUN pip install torch==2.1.1 torchvision==0.16.1 torchaudio==2.1.1 --index-url https://download.pytorch.org/whl/cu121
+# Conditional installation of PyTorch for AMD architecture
+RUN if [ "${BASE_IMAGE}" = "amd" ]; then \
+    pip install torch==2.1.1 torchvision==0.16.1 torchaudio==2.1.1 --index-url https://download.pytorch.org/whl/cu121; \
+    fi
 
 # NVIDIA Container Runtime Configuration
 ENV NVIDIA_VISIBLE_DEVICES ${NVIDIA_VISIBLE_DEVICES:-all}
@@ -41,10 +57,7 @@ ENV QT_X11_NO_MITSHM=1
 ENV QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/x86_64-linux-gnu/qt5/plugins/platforms
 
 # Set up working directories and clone relevant repositories
-WORKDIR ${home}
+WORKDIR ${HOME}
 RUN git clone --branch ubuntu22_cuda --recursive https://github.com/AnielAlexa/pyslam.git
-WORKDIR ${home}/pyslam
+WORKDIR ${HOME}/pyslam
 RUN git submodule update --init --recursive
-
-
-