orchestrate containers using compose instead of makefile

scripts/docker/Makefile

@@ -1,23 +1,12 @@
-all:
+build-all:
 	docker build -t danceos/fail-base fail-base
 	docker build -t danceos/fail-generic-tracing fail-generic-tracing
 	docker build -t danceos/fail-demo fail-demo
 
+run-all: .compose ssh
 
-run-fail-db:
+.compose:
-	docker run --rm --name fail-db \
+	docker compose up -d --force-recreate --renew-anon-volumes -y
-		-e MYSQL_ROOT_PASSWORD=fail \
-		-e MYSQL_USER=fail \
-		-e MYSQL_PASSWORD=fail \
-		-e MYSQL_DATABASE=fail \
-		-p 3306:3306 \
-		-d mysql
 
-run-fail-demo:
+ssh:
-	docker run --rm --name fail-demo \
-		-p 5000:5000 \
-		-p 5022:22 \
-		-d danceos/fail-demo
-
-ssh-fail-demo:
 	ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 5022 fail@127.0.0.1

scripts/docker/docker-compose.yaml

@@ -0,0 +1,26 @@
+services:
+  fail-db:
+    image: mysql
+    container_name: fail-db
+    environment:
+      MYSQL_ROOT_PASSWORD: fail
+      MYSQL_USER: fail
+      MYSQL_PASSWORD: fail
+      MYSQL_DATABASE: fail
+    # ports:
+    #   - "3306:3306"
+    networks:
+      - fail-network
+
+  fail-demo:
+    image: danceos/fail-demo
+    container_name: fail-demo
+    ports:
+      - "5000:5000" # Result Browser
+      - "5022:22" # SSH
+    networks:
+      - fail-network
+
+networks:
+  fail-network:
+    driver: bridge

scripts/docker/fail-base/Dockerfile

@@ -119,7 +119,8 @@ RUN wget http://www.aspectc.org/releases/"$acversion"/ac-bin-linux-x86-64bit-"$a
 ENV PATH=/home/fail/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 # Clone FAIL*
-RUN git clone https://github.com/danceos/fail.git
+# RUN git clone https://github.com/danceos/fail.git
+RUN git clone https://gitea.vps.chriphost.de/christoph/fail
 WORKDIR fail
 
 USER root

scripts/docker/fail-demo/Dockerfile

@@ -16,7 +16,8 @@ WORKDIR /home/fail
 RUN echo 'export PATH=$HOME/bin:$PATH' >> ~/.profile \
  && echo 'cd $HOME/fail-targets' >> ~/.profile
 
-RUN git clone https://github.com/danceos/fail-targets.git
+# RUN git clone https://github.com/danceos/fail-targets.git
+RUN git clone https://gitea.vps.chriphost.de/christoph/fail-targets
 
 WORKDIR fail
 RUN mkdir build; cd build
@@ -113,10 +114,9 @@ RUN cmake \
 RUN cmake --build . --target libfailbochs_external-configure -- -j$(nproc) \
  && cmake --build . -- -j$(nproc)
 
-# Make FAIL*
 RUN ln -s /home/fail/fail/build/bin/fail-client               /home/fail/bin/generic-experiment-client \
  && ln -s /home/fail/fail/build/bin/generic-experiment-server /home/fail/bin/ \
- && ln -s /home/fail/fail/tools/analysis/resultbrowser/run.py /home/fail/bin/resultbrowser
+ && ln -s /home/fail/fail/tools/analysis/resultbrowser/run.py /home/fail/bin/resultbrowser.py
 
 USER root
 

scripts/docker/fail-generic-tracing/Dockerfile

@@ -103,12 +103,12 @@ RUN cmake \
 RUN cmake --build . --target libfailbochs_external-configure -- -j$(nproc) \
  && cmake --build . -- -j$(nproc)
 
-RUN ln -s /home/fail/fail/build-tracer/bin/fail-client                           /home/fail/bin/fail-x86-tracing \
+RUN ln -s /home/fail/fail/build-tracer/bin/fail-client                             /home/fail/bin/generic-tracing-client \
  && ln -s /home/fail/fail/build-tracer/bin/import-trace                            /home/fail/bin/ \
  && ln -s /home/fail/fail/build-tracer/bin/prune-trace                             /home/fail/bin/ \
  && ln -s /home/fail/fail/build-tracer/bin/dump-trace                              /home/fail/bin/ \
  && ln -s /home/fail/fail/build-tracer/bin/convert-trace                           /home/fail/bin/ \
- && cp /home/fail/fail/tools/bochs-experiment-runner/bochs-experiment-runner.py  /home/fail/bin/bochs-experiment-runner.py \
+ && ln -s /home/fail/fail/tools/bochs-experiment-runner/bochs-experiment-runner.py /home/fail/bin/ \
  && chmod a+x /home/fail/bin/bochs-experiment-runner.py
 
 USER root