From 4a3cd8b40f13a878f9568bbfb0b54236232182e8 Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Mon, 2 Dec 2024 10:22:17 +0000 Subject: [PATCH] add docker override variable --- environment.sh | 2 +- services/bl01t-di-cam-01/config/ioc.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/environment.sh b/environment.sh index 602bee5..87435e7 100755 --- a/environment.sh +++ b/environment.sh @@ -19,7 +19,7 @@ if [[ $(module avail docker-compose 2>/dev/null) != "" ]] ; then module load docker-compose fi -# podman is priority, set USE_DOCKER=1 to force docker when both are available +# podman vs docker differences. if podman version &> /dev/null && [[ -z $USE_DOCKER ]] ; then USER_ID=0; USER_GID=0 DOCKER_HOST=unix:///run/user/$(id -u)/podman/podman.sock diff --git a/services/bl01t-di-cam-01/config/ioc.yaml b/services/bl01t-di-cam-01/config/ioc.yaml index fa85e6a..beac6e8 100644 --- a/services/bl01t-di-cam-01/config/ioc.yaml +++ b/services/bl01t-di-cam-01/config/ioc.yaml @@ -4,6 +4,9 @@ ioc_name: "{{ _global.get_env('IOC_NAME') }}" description: Example simulated camera for BL01T entities: + - type: devIocStats.iocAdminSoft + IOC: "{{ ioc_name | upper }}" + - type: ADSimDetector.simDetector PORT: DET.DET P: BL01T-DI-CAM-01