From e73e17a730ea48e0a02dffe5000c69083209b42a Mon Sep 17 00:00:00 2001
From: Tobit Flatscher <53856473+2b-t@users.noreply.github.com>
Date: Sun, 3 Nov 2024 18:31:16 +0000
Subject: [PATCH] refactor: Update Docker to 24.04 and remove unused
 Dockerfiles

---
 .devcontainer/devcontainer.json      | 22 +++++++++++-----------
 docker/Dockerfile                    | 14 +-------------
 docker/docker-compose-gui-nvidia.yml | 10 ----------
 docker/docker-compose-gui.yml        |  1 -
 docker/docker-compose-nvidia.yml     |  9 ---------
 docker/docker-compose.yml            | 13 ++++++-------
 6 files changed, 18 insertions(+), 51 deletions(-)
 delete mode 100644 docker/docker-compose-gui-nvidia.yml
 delete mode 100644 docker/docker-compose-nvidia.yml

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d9093ef..2f5b737 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,18 +1,18 @@
 {
-  "name": "LB-t Docker Compose",
+  "name": "LB-t Docker",
   "dockerComposeFile": [
-    "../docker/docker-compose.yml" // Alternatives: "../docker/docker-compose-gui.yml", "../docker/docker-compose-gui-nvidia.yml", "../docker/docker-compose-nvidia.yml"
+    "../docker/docker-compose.yml" // Alternative: "../docker/docker-compose-gui.yml"
   ],
   "service": "lbt_docker",
   "workspaceFolder": "/code/lbt",
   "shutdownAction": "stopCompose",
-  "extensions": [
-    "zachflower.uncrustify",
-    "ms-azuretools.vscode-docker",
-    "ms-vscode.cpptools",
-    "redhat.vscode-yaml",
-    "streetsidesoftware.code-spell-checker",
-    "twxs.cmake",
-    "yzhang.markdown-all-in-one"
-  ]
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-python.python",
+        "ms-vscode.cmake-tools",
+        "ms-vscode.cpptools"
+      ]
+    }
+  }
 }
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d7151a1..45a12a4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,31 +1,19 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 WORKDIR /code
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Install general tools: Git, Cmake, GCC, OpenMP
 RUN apt-get update \
  && apt-get install -y \
     build-essential \
     cmake \
     git-all \
     libomp-dev \
- && rm -rf /var/lib/apt/lists/*
-
-# Install VTK
-RUN apt-get update \
- && apt-get install -y \
     libvtk9-qt-dev \
- && rm -rf /var/lib/apt/lists/*
-
-# Install nlohmann-json
-RUN apt-get -y update \
- && apt-get install -y \
     nlohmann-json3-dev \
  && rm -rf /var/lib/apt/lists/*
 
-# Install GTest
 RUN apt-get update \
  && apt-get install -y  \
     libgtest-dev \
diff --git a/docker/docker-compose-gui-nvidia.yml b/docker/docker-compose-gui-nvidia.yml
deleted file mode 100644
index 0e17517..0000000
--- a/docker/docker-compose-gui-nvidia.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: "3.9"
-services:
-  lbt_docker:
-    extends:
-      file: docker-compose-gui.yml
-      service: lbt_docker
-    environment:
-     - NVIDIA_VISIBLE_DEVICES=all
-     - NVIDIA_DRIVER_CAPABILITIES=all
-    runtime: nvidia
diff --git a/docker/docker-compose-gui.yml b/docker/docker-compose-gui.yml
index 850ee5e..699bf1e 100644
--- a/docker/docker-compose-gui.yml
+++ b/docker/docker-compose-gui.yml
@@ -7,7 +7,6 @@ services:
     environment:
      - DISPLAY=${DISPLAY}
      - QT_X11_NO_MITSHM=1
-    privileged: true
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix:rw
       - /tmp/.docker.xauth:/tmp/.docker.xauth:rw
diff --git a/docker/docker-compose-nvidia.yml b/docker/docker-compose-nvidia.yml
deleted file mode 100644
index 6980763..0000000
--- a/docker/docker-compose-nvidia.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: "3.9"
-services:
-  lbt_docker:
-    extends:
-      file: docker-compose.yml
-      service: lbt_docker
-    environment:
-     - NVIDIA_VISIBLE_DEVICES=all
-    runtime: nvidia
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 44cd0a1..2048f08 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,15 +2,14 @@ version: "3.9"
 services:
   lbt_docker:
     build:
-      context: .
-      dockerfile: Dockerfile
-    #stdin_open: true # Docker run -i
-    tty: true # Docker run -t
-    volumes: # Mount relevant folders into container
-      - ../.vscode:/code/lbt/.vscode # Necessary for using VS Code tasks also inside container
+      context: ..
+      dockerfile: docker/Dockerfile
+    tty: true
+    volumes:
+      - ../.vscode:/code/lbt/.vscode
+      - ../examples:/code/lbt/examples
       - ../include:/code/lbt/include
       - ../src:/code/lbt/src
       - ../test:/code/lbt/test
-      - ../examples:/code/lbt/examples
       - ../CMakeLists.txt:/code/lbt/CMakeLists.txt
       - ../Makefile:/code/lbt/Makefile