From 476db5ee6da8378d1b1fd32bbde623adb8f951fb Mon Sep 17 00:00:00 2001 From: Zoheb Shaikh <26975142+ZohebShaikh@users.noreply.github.com> Date: Tue, 26 May 2026 08:27:42 +0100 Subject: [PATCH 1/2] docs: add docs for diamond machines --- docs/tutorials/local-auth.md | 10 ++++++++++ example-services | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/tutorials/local-auth.md b/docs/tutorials/local-auth.md index 149ba33adf..452b899123 100644 --- a/docs/tutorials/local-auth.md +++ b/docs/tutorials/local-auth.md @@ -6,6 +6,16 @@ To run the stack: 1. In the root directory run `git submodule update --init --recursive` to initialise the example-services repo 2. Run `docker compose -f tests/system_tests/compose.yaml up -d` to launch an instance of NumTracker, RabbitMQ, Keycloak, Tiled, OPA and a number of IOCs, in detached mode +>[!NOTE] +> On DLS workstations, perform these setup steps since docker compose is not available by default: +> Run `systemctl enable --user podman.socket --now` to set up a podman user service and socket +> Add the following lines to your `$HOME/.profile` file: +> ``` +> module load docker-compose/5.1.1 +> export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/podman/podman.sock +> alias docker=podman +> ``` + 3. Run `source tests/system_tests/.env` which will set required EPICS environmental variables 4. Run `blueapi -c tests/system_tests/config.yaml serve` to launch BlueAPI configured to use the launched stack. This may take a while, as BlueAPI will attempt to connect to a number of devices via Channel Access diff --git a/example-services b/example-services index 3c0274b244..9e0faf7cbe 160000 --- a/example-services +++ b/example-services @@ -1 +1 @@ -Subproject commit 3c0274b244d28bc6e197f9e3610355cc7c0cc5d3 +Subproject commit 9e0faf7cbea7e40ea63d857f046f61675b35b907 From af03803b5a2a3abcee0ca222f3390eb175720f17 Mon Sep 17 00:00:00 2001 From: Zoheb Shaikh <26975142+ZohebShaikh@users.noreply.github.com> Date: Tue, 26 May 2026 08:59:15 +0100 Subject: [PATCH 2/2] Add new line --- docs/tutorials/local-auth.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/tutorials/local-auth.md b/docs/tutorials/local-auth.md index 452b899123..b1e85e657c 100644 --- a/docs/tutorials/local-auth.md +++ b/docs/tutorials/local-auth.md @@ -8,7 +8,9 @@ To run the stack: 2. Run `docker compose -f tests/system_tests/compose.yaml up -d` to launch an instance of NumTracker, RabbitMQ, Keycloak, Tiled, OPA and a number of IOCs, in detached mode >[!NOTE] > On DLS workstations, perform these setup steps since docker compose is not available by default: +> > Run `systemctl enable --user podman.socket --now` to set up a podman user service and socket +> > Add the following lines to your `$HOME/.profile` file: > ``` > module load docker-compose/5.1.1