remove sncseq

Dockerfile

@@ -98,11 +98,6 @@ RUN git clone ${EPICS_BASE_SRC} -q ${GIT_OPTS} ${EPICS_BASE} && \
     bash /epics/scripts/patch-epics-base.sh
 RUN make -C ${EPICS_BASE} -j $(nproc); make -C ${EPICS_BASE} clean
 
-# also build the sequencer as it is used by many support modules
-RUN bash /epics/scripts/get-sncseq.sh
-RUN make -C ${SUPPORT}/sncseq -j $(nproc); make -C ${SUPPORT}/sncseq clean
-
-# setup a global python venv and install ibek
 COPY requirements.txt /requirements.txt
 RUN python3 -m venv ${VIRTUALENV} && pip install -r /requirements.txt
 
@@ -111,8 +106,7 @@ RUN python3 -m venv ${VIRTUALENV} && pip install -r /requirements.txt
 FROM developer AS runtime_prep
 
 # get the products from the build stage and reduce to runtime assets only
-RUN ibek ioc extract-runtime-assets /assets --no-defaults --extras /venv && \
-    bash /epics/scripts/runtime-prep-epics-base.sh
+RUN ibek ioc extract-runtime-assets /assets --no-defaults /venv
 
 ##### runtime stage ############################################################
 

build

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-# a script to locally build all targets using podman or docker
+################################################################################
+# generic local build script for epics-containers repositories                 #
+################################################################################
 
 # set TARGET_ARCHITECTURE to rtems for RTEMS based targets
 T_A=${TARGET_ARCHITECTURE:-linux}
@@ -9,24 +11,19 @@ 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})
 
 # use docker if available else use podman
 if ! docker version &>/dev/null; then docker=podman; else docker=docker; fi
-
-if ! $docker buildx version &>/dev/null; then
-    echo "buildx required. (install with 'apt install docker-buildx')"
-    exit 1
-fi
+if $docker buildx version &>/dev/null; then builx=buildx; load=--load; fi
 
 # make sure new repos get their submodule ibek-support
-git submodule update --init
+if [ ! -d ibek-support ] ; then git submodule update --init ; fi
 
 # build and developer images
-$docker buildx build --load --network host --target $TARGET \
-        --build-arg TARGETARCH=amd64 \
-        --build-arg TARGET_ARCHITECTURE=$T_A \
-        -t ${TAG} .
+$docker build $buildx -t ${TAG} --build-arg \
+    TARGET_ARCHITECTURE=$T_A $load --target $TARGET .
+

epics/scripts/patch-epics-base.sh

@@ -2,14 +2,13 @@
 
 THIS_DIR=$(dirname $(readlink -f $0))
 
-# don't compile tests - saving container space
-sed -i /epics/epics-base/modules/*/Makefile -e '/\+\= test/d'
-rm -r /epics/epics-base/modules/*/test*
+# comment out the test directories from the Makefile
+sed -i -E 's/(^[^#].*+= test.*$)/# \1/' \
+    /epics/epics-base/Makefile \
+    /epics/epics-base/modules/*/Makefile
 
 if [[ $TARGET_ARCHITECTURE == "rtems" ]]; then
-    echo "Configuring epics-base to build RTEMS beatnik only"
-
-    echo "VALID_BUILDS=Host" >> ${EPICS_BASE}/configure/CONFIG_SITE.Common.linux-x86_64
+    echo "Configuring epics-base to build RTEMS beatnik"
 
     cp ${THIS_DIR}/rtems/CONFIG_SITE.local ${EPICS_BASE}/configure/CONFIG_SITE.local
 fi

requirements.txt

@@ -1 +1 @@
-ibek==1.5.2
+ibek==1.7.0