Merge pull request #42 from epics-containers/RTEMS6

Update RTEMS BSP to 6.1ec3

.github/workflows/build.yml

@@ -29,7 +29,7 @@ jobs:
           - epics-target: RTEMS-beatnik
             epics-host: linux-x86_64
             name: epics-base-rtems-beatnik
-            base_image: ghcr.io/epics-containers/rtems-beatnik-runtime:6.1rc2
+            base_image: ghcr.io/epics-containers/rtems-beatnik-runtime:6.1ec3
             platform: linux/amd64
 
           # cross compile to arm64

Dockerfile

@@ -6,8 +6,8 @@
 #   EPICS_HOST_ARCH: the epics host architecture name
 #   BASE_IMAGE: can be used to bring in cross compilation tools
 
-ARG BASE_IMAGE=ubuntu:24.04
-ARG RUNTIME_BASE=ubuntu:24.04
+ARG BASE_IMAGE=ubuntu:22.04
+ARG RUNTIME_BASE=ubuntu:22.04
 
 ##### developer stage ##########################################################
 FROM ${BASE_IMAGE} AS developer
@@ -62,7 +62,8 @@ RUN bash ${EPICS_ROOT}/scripts/make_pvxs.sh
 ENV PATH=${EPICS_ROOT}/pvxs/bin/${EPICS_HOST_ARCH}:${PATH}
 
 # create a virtual environment to be used by IOCs to install ibek
-RUN python3 -m venv /venv
+# except when based on the RTEMS BSP image which supplies /venv
+RUN ! test -d /venv && python3 -m venv /venv
 
 ##### runtime preparation stage ################################################
 FROM developer AS runtime_prep
@@ -77,15 +78,15 @@ ARG EPICS_TARGET_ARCH=linux-x86_64
 ARG EPICS_HOST_ARCH=linux-x86_64
 
 # environment variables - IMPORTANT: must be duplicated in the developer stage
-ENV EPICS_VERSION=R7.0
+ENV EPICS_VERSION=7.0
 ENV EPICS_TARGET_ARCH=${EPICS_TARGET_ARCH}
 ENV EPICS_HOST_ARCH=${EPICS_HOST_ARCH}
 ENV EPICS_ROOT=/epics
 ENV EPICS_BASE=${EPICS_ROOT}/epics-base
 ENV SUPPORT ${EPICS_ROOT}/support
 ENV IOC ${EPICS_ROOT}/ioc
 ENV PATH=/venv/bin:${EPICS_BASE}/bin/${EPICS_HOST_ARCH}:${PATH}
-ENV LD_LIBRARY_PATH=${EPICS_BASE}/lib/${EPICS_HOST_ARCH}z
+ENV LD_LIBRARY_PATH=${EPICS_BASE}/lib/${EPICS_HOST_ARCH}
 
 # add products from build stage
 COPY --from=runtime_prep /assets /

build

@@ -14,7 +14,7 @@ TARGET=${TARGET:-developer}
 TAG=${TAG:-ec_test}
 
 if [ "$T_A" = "RTEMS-beatnik" ]; then
-    base="ghcr.io/epics-containers/rtems-beatnik-runtime"
+    base="ghcr.io/epics-containers/rtems-beatnik-runtime:6.1ec1"
 else
     base="ubuntu:24.04"
 fi