Skip to content

Commit

Permalink
add docker override variable
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Dec 2, 2024
1 parent 55d0cfa commit 4a3cd8b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions services/bl01t-di-cam-01/config/ioc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4a3cd8b

Please sign in to comment.