template 3.4.0

.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 3.4.0b2
+_commit: 3.4.0
 _src_path: gh:epics-containers/ioc-template
 description: Generic IOC for the Delta Tau turbo pmac and power pmac motion controllers
 git_platform: github.com

build

@@ -25,7 +25,7 @@ if ! docker version &>/dev/null; then docker=podman; else docker=docker; fi
 if $docker buildx version &>/dev/null; then builx=buildx; load=--load; fi
 
 # make sure new repos get their submodule ibek-support
-if [ ! -d ibek-support/_globals ] ; then git submodule update --init ; fi
+if [ ! -d ibek-support/_global ] ; then git submodule update --init ; fi
 
 # build and developer images
 set -x

requirements.txt

@@ -1,3 +1,3 @@
-ibek==1.8.2b4
+ibek==2.0.1
 # to install direct from github during development in a branch
 # git+https://github.com/epics-containers/ibek.git@fix-extract-assets

tests/run-tests.sh

@@ -14,7 +14,7 @@ CONF=/epics/ioc/config
 set -ex
 
 # use docker if available else use podman
-if ! docker version &>/dev/null; then alias docker=podman; fi
+if docker version &>/dev/null; then docker=docker; else docker=podman; fi
 
 cd ${ROOT}
 
@@ -23,7 +23,7 @@ export TAG=${TAG:-ec_test}
 if [[ ${TAG} == "ec_test" ]] ; then TARGET=runtime ./build; fi
 
 # try out a test ibek config IOC instance with the generic IOC
-result=$(docker run --rm -v ${THIS}/config:${CONF} ${TAG} /epics/ioc/start.sh 2>&1)
+result=$($docker run --rm -v ${THIS}/config:${CONF} ${TAG} /epics/ioc/start.sh 2>&1)
 
 # check that the IOC output expected results
 if echo "${result}" | grep -i error; then