From 3a3ce740039d701a90598440f43c67b0e8234246 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Thu, 12 Mar 2026 10:16:09 +0100 Subject: [PATCH] replace compose-file with direct docker command + add dbeaver recipe --- docker-compose.yaml | 11 ----------- justfile | 32 +++++++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 16 deletions(-) delete mode 100644 docker-compose.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml deleted file mode 100644 index 3519a33..0000000 --- a/docker-compose.yaml +++ /dev/null @@ -1,11 +0,0 @@ -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" diff --git a/justfile b/justfile index 7e59cba..ba9ff53 100644 --- a/justfile +++ b/justfile @@ -37,7 +37,7 @@ WAMRCFLAGS := "\ " XXD := "xxd" -# Load AOT from WAMR +# Load AOT from WAMR (FAIL+Baremetal) CROSS_CFLAGS := "\ -I./targets/wasm-host \ @@ -147,15 +147,32 @@ FAIL_SERVER := "generic-experiment-server --database-option-file ./db.conf" FAIL_INJECT := "generic-experiment-client" RESULT_BROWSER := "resultbrowser.py -c ./db.conf" -[doc("Start MySQL to receive FAIL* trace/campaign results")] +[doc("Start MySQL container to receive FAIL* trace/campaign results")] [group("fail")] start-db: - docker compose up + docker run -d \ + --name fail-db \ + -e MYSQL_ROOT_PASSWORD=fail \ + -e MYSQL_USER=fail \ + -e MYSQL_PASSWORD=fail \ + -e MYSQL_DATABASE=fail \ + -p 3306:3306 \ + mysql -[doc("Stop MySQL")] +[doc("Connect to MySQL database using DBeaver")] +[group("fail")] +connect-db: + dbeaver -con "name=fail|driver=mysql|host=localhost|port=3306|database=fail|user=fail|password=fail" + +[doc("Stop MySQL container")] [group("fail")] stop-db: - docker compose down + docker stop fail-db + +[doc("Remove MySQL container")] +[group("fail")] +remove-db: + docker container rm fail-db [doc("Trace a golden run using FAIL*")] [group("fail")] @@ -176,6 +193,11 @@ trace module: -Wf,--elf-file={{ BUILD_DIR }}-{{ module }}/system.elf @echo "Next step: \"just import {{ module }}\"" +# [doc("Dump a FAIL* golden run trace")] +# [group("fail")] +# dump module: +# {{ FAIL_DUMP }} {{ BUILD_DIR }}-{{ module }}/trace.pb + [doc("Import a FAIL* golden run trace")] [group("fail")] import module: