From 6c9323adece440ab71bd0f53099cf717b45c2572 Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Tue, 27 Aug 2024 13:27:23 +0100 Subject: [PATCH] update to latest template to fix check_docker --- .copier-answers.yml | 2 +- environment.sh | 5 +++-- services/bl01t-mo-sim-01/config/ioc.yaml | 11 +++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 475f2c1..945a585 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: 3.6.0-2-g556dcca +_commit: 4.0.0-1-ged644ee _src_path: gh:epics-containers/services-template-compose description: example IOC Instances and Services using docker compose services: example diff --git a/environment.sh b/environment.sh index 97e5868..02f84af 100644 --- a/environment.sh +++ b/environment.sh @@ -22,9 +22,10 @@ fi function check_docker { # return 0 if docker is detected, or 1 otherwise, # cope with the possibility that podman is aliased to docker - if [[ $(docker version) =~ "Podman" ]]&> /dev/null; then - return 1 + if [[ $(docker version) =~ "Docker" ]]&> /dev/null; then + return 0 fi + return 1 } # set user id for the phoebus container for easy X11 forwarding. diff --git a/services/bl01t-mo-sim-01/config/ioc.yaml b/services/bl01t-mo-sim-01/config/ioc.yaml index c6e4f68..c566265 100644 --- a/services/bl01t-mo-sim-01/config/ioc.yaml +++ b/services/bl01t-mo-sim-01/config/ioc.yaml @@ -1,6 +1,5 @@ # yaml-language-server: $schema=https://github.com/epics-containers/ioc-motorsim/releases/download/2024.9.1/ibek.ioc.schema.json -# TODO replace above with the generic IOC schema this IOC is based on ioc_name: "{{ _global.get_env('IOC_NAME') }}" description: REPLACE WITH DESCRIPTION @@ -15,19 +14,19 @@ entities: - type: motorSim.simMotorController controllerName: sim-controller1 - numAxes: 2 + numAxes: 3 P: "BL01T-MO-SIMC-01:" - type: motorSim.simMotorAxis controller: sim-controller1 - ADDR: 0 + ADDR: 1 M: M1 DESC: Motor 1 - home: 0 + home: 1 - type: motorSim.simMotorAxis controller: sim-controller1 - ADDR: 1 + ADDR: 2 M: M2 DESC: Motor 2 - home: 0 + home: 2