Merge pull request #64 from KIT-MRT/improve_docker

Improve docker images (versioning, cleanup)

.env

@@ -0,0 +1 @@
+version

Dockerfile

@@ -24,7 +24,11 @@ RUN git clone https://github.com/KIT-MRT/util_caching.git /tmp/util_caching && \
 
 
 # Install arbitration_graphs
-COPY . /tmp/arbitration_graphs
+COPY CMakeLists.txt /tmp/arbitration_graphs/
+COPY cmake /tmp/arbitration_graphs/cmake
+COPY include /tmp/arbitration_graphs/include
+COPY test /tmp/arbitration_graphs/test
+
 RUN mkdir /tmp/arbitration_graphs/build && \
     cd /tmp/arbitration_graphs/build && \
     cmake .. && \

README.md

@@ -75,8 +75,8 @@ Follow the steps above to setup the Docker image.
 Then, run the development image.
 
 ```bash
-docker compose -f docker-compose.devel.yaml build
-docker compose -f docker-compose.devel.yaml run --rm arbitration_graphs_devel
+docker compose build
+docker compose run --rm arbitration_graphs_devel
 ```
 
 This mounts the source into the container's `/home/blinky/arbitration_graphs` folder.

demo/.env

@@ -0,0 +1 @@
+../.env

demo/Dockerfile

@@ -1,4 +1,5 @@
-FROM ghcr.io/kit-mrt/arbitration_graphs:latest AS tutorial
+ARG VERSION
+FROM ghcr.io/kit-mrt/arbitration_graphs:$VERSION AS tutorial
 
 USER root
 
@@ -33,7 +34,7 @@ COPY --chown=blinky:blinky CMakeLists.txt /home/blinky/demo/CMakeLists.txt
 WORKDIR /home/blinky/demo/build
 
 RUN cmake -DCMAKE_BUILD_TYPE=Release .. && \
-    cmake --build .
+    cmake --build . -j8
 
 CMD [ "/home/blinky/demo/build/arbitration_graphs_pacman_demo_exe" ]
 

demo/docker-compose.yaml

@@ -1,9 +1,12 @@
 services:
   tutorial:
+    image: ghcr.io/kit-mrt/arbitration_graphs_pacman_tutorial:$VERSION
     build:
       context: .
+      args:
+        - VERSION=$VERSION
       target: tutorial
-    image: arbitration_graphs_pacman_tutorial
+    env_file: .env
     volumes:
       - .:/home/blinky/demo
       - $HOME/.Xauthority:/home/blinky/.Xauthority
@@ -12,10 +15,13 @@ services:
       - DISPLAY=$DISPLAY
 
   demo:
+    image: ghcr.io/kit-mrt/arbitration_graphs_pacman_demo:$VERSION
     build:
       context: .
+      args:
+        - VERSION=$VERSION
       target: demo
-    image: arbitration_graphs_pacman_demo
+    env_file: .env
     volumes:
       - $HOME/.Xauthority:/home/blinky/.Xauthority
       - /tmp/.X11-unix:/tmp/.X11-unix

docker-compose.yaml

@@ -1,4 +1,11 @@
 services:
   arbitration_graphs:
-    image: arbitration_graphs
-    build: .
+    image: ghcr.io/kit-mrt/arbitration_graphs:$VERSION
+    build: .
+    env_file: .env
+  arbitration_graphs_devel:
+    extends:
+      service: arbitration_graphs
+    image: arbitration_graphs_devel
+    volumes:
+      - .:/home/blinky/arbitration_graphs

version

@@ -0,0 +1 @@
+VERSION=v0.0.1