Merge branch 'template' of github.com:epics-containers/ioc-pmac into …

…template

.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 3.2.0b1
+_commit: 3.2.0b3
 _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

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
         "dockerfile": "../Dockerfile",
         "target": "developer",
         "args": {
-            "TARGET_ARCHITECTURE": "linux"
+            "TARGET_ARCHITECTURE": "rtems"
         }
     },
     "remoteEnv": {

.github/workflows/build.yml

@@ -13,7 +13,6 @@ jobs:
       packages: write
     strategy:
       fail-fast: false
-      max-parallel: 1 # take advantage of caching
       matrix:
         epics-target: [RTEMS-beatnik, linux-x86_64, linux-arm]
         target: [developer, runtime]

Dockerfile

@@ -21,17 +21,23 @@ WORKDIR ${SOURCE_FOLDER}/ibek-support
 # copy the global ibek files
 COPY ibek-support/_global/ _global
 
+COPY ibek-support/sequencer sequencer
+RUN sequencer/install.sh R2-2-9
+
 COPY ibek-support/iocStats/ iocStats
 RUN iocStats/install.sh 3.2.0
 
 COPY ibek-support/asyn/ asyn/
-RUN asyn/install.sh R4-42
+RUN asyn/install.sh R4-44-2
 
 COPY ibek-support/autosave/ autosave/
 RUN autosave/install.sh R5-11
 
 COPY ibek-support/busy/ busy/
-RUN busy/install.sh R1-7-3
+RUN busy/install.sh R1-7-4
+
+COPY ibek-support/sscan/ sscan/
+RUN sscan/install.sh R2-11-6
 
 COPY ibek-support/calc/ calc/
 RUN calc/install.sh R3-7-5

build

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ################################################################################
-# generic local build script for epics-containers ioc repositories             #
+# generic local build script for epics-containers repositories                 #
 ################################################################################
 
 # set TARGET_ARCHITECTURE to rtems for RTEMS based targets
@@ -11,7 +11,7 @@ TARGET=${TARGET:-developer}
 # set TAG to override the default tag
 TAG=${TAG:-ec_test}
 
-# log commands and stop on erros
+# log commands and stop on errors
 set -xe
 
 cd $(dirname ${0})
@@ -21,9 +21,8 @@ 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
-# allow failure to support working with modified submodule
-git submodule update --init || true
+if [ ! -d ibek-support ] ; then git submodule update --init ; fi
 
 # build and developer images
-$docker build -t ${TAG} --build-arg TARGET_ARCHITECTURE=$T_A $load --target $TARGET .
-
+$docker build $buildx -t ${TAG} --build-arg \
+    TARGET_ARCHITECTURE=$T_A $load --target $TARGET .