Skip to content

Commit

Permalink
update to latest template to fix check_docker
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Aug 27, 2024
1 parent 18b9b49 commit 6c9323a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
11 changes: 5 additions & 6 deletions services/bl01t-mo-sim-01/config/ioc.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

0 comments on commit 6c9323a

Please sign in to comment.