Skip to content

Commit

Permalink
refactor: Update Docker to 24.04 and remove unused Dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
2b-t committed Nov 3, 2024
1 parent 6f59e2f commit e73e17a
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 51 deletions.
22 changes: 11 additions & 11 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
}
14 changes: 1 addition & 13 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
10 changes: 0 additions & 10 deletions docker/docker-compose-gui-nvidia.yml

This file was deleted.

1 change: 0 additions & 1 deletion docker/docker-compose-gui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 0 additions & 9 deletions docker/docker-compose-nvidia.yml

This file was deleted.

13 changes: 6 additions & 7 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit e73e17a

Please sign in to comment.