update to latest ibek features

.devcontainer/devcontainer.json

@@ -9,8 +9,7 @@
         }
     },
     "remoteEnv": {
-        "DISPLAY": "${localEnv:DISPLAY}",
-        "PROJECT_NAME": "${localWorkspaceFolderBasename}"
+        "DISPLAY": "${localEnv:DISPLAY}"
     },
     "customizations": {
         "vscode": {
@@ -31,10 +30,13 @@
     },
     // Make sure the files we are mapping into the container exist on the host
     "initializeCommand": "bash .devcontainer/initializeCommand ${devcontainerId}",
+    "postCreateCommand": "bash .devcontainer/postCreateCommand ${devcontainerId}",
     "runArgs": [
         "--net=host",
         "--security-opt=label=disable"
     ],
+    "workspaceMount": "source=${localWorkspaceFolder},target=/epics/ioc-adaravis,type=bind",
+    "workspaceFolder": "/epics/ioc-adaravis",
     "mounts": [
         // Mount some useful local files from the user's home directory
         "source=${localEnv:HOME}/.bash_eternal_history,target=/root/.bash_eternal_history,type=bind",

.devcontainer/postCreateCommand

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# the IOC is made at build time but the devcontainer mounts over the top of it
+# so we need to regenerate it for devcontainer use
+
+cd /epics/ioc-config
+
+ibek ioc make-source-template
+ibek ioc generate-makefile
+ibek ioc compile

.gitignore

@@ -2,3 +2,10 @@
 repos*
 # build pulls the schema out of the container - ignore it
 *.ibek.ioc.schema.json
+# while working on ibek with this project somethimes include it as subfolder
+ibek
+
+# The ioc source tree is created here from a template inside the generic ioc
+# repo.
+# Remove from .gitignore if you want to customize the template.
+/ioc/

Dockerfile

@@ -6,11 +6,12 @@ ARG REGISTRY=ghcr.io/epics-containers
 
 FROM  ${REGISTRY}/epics-base-${TARGET_ARCHITECTURE}-developer:${BASE} AS developer
 
-# In a devcontainer this folder is mounted on the host's clone of ioc-adsimdetector
-WORKDIR /workspaces/ioc-adsimdetector/ibek-support
+# the devcontainer mounts the project root to /epics/ioc-adaravis
+WORKDIR /epics/ioc-adaravis/ibek-support
 
 # During Development get latest ibek - TODO stable version will be in epics-base
-RUN pip install --upgrade ibek
+COPY ibek /ibek
+RUN pip install /ibek
 
 # copy the global ibek files
 COPY ibek-support/_global/ _global
@@ -33,8 +34,8 @@ RUN ADCore/install.sh R3-12-1
 COPY ibek-support/ADAravis/ ADAravis/
 RUN ADAravis/install.sh R2-3
 
-# add startup scripts
-COPY ioc ${IOC}
+# create IOC source tree
+RUN ibek ioc make-source-template
 
 # Make the IOC
 RUN ibek ioc generate-makefile
@@ -48,28 +49,18 @@ RUN bash -c "ibek ioc generate-schema */*ibek.support.yaml --output ${IOC}/adara
 FROM developer AS runtime_prep
 
 # get the products from the build stage and reduce to runtime assets only
-WORKDIR /min_files
-RUN bash /epics/scripts/minimize.sh ${IOC} $(ls -d ${SUPPORT}/*/)
+RUN ibek ioc extract-runtime-assets /assets --extras /usr/local/lib/x86_64-linux-gnu
 
 ##### runtime stage ############################################################
 
 FROM ${REGISTRY}/epics-base-${TARGET_ARCHITECTURE}-runtime:${BASE} AS runtime
 
-# get the virtual environment from the developer stage
-COPY --from=developer /venv /venv
-# add products from build stage
-COPY --from=runtime_prep /min_files /
-# get the Aravis library we built
-COPY --from=developer /usr/local/lib/x86_64-linux-gnu/libaravis-0.8.so.0 /usr/local/lib/x86_64-linux-gnu/
-# get the ibek-support folders for accessing the SUPPORT YAML files
-COPY --from=developer /workspaces /workspaces
+# get runtime assets from the preparation stage
+COPY --from=runtime_prep /assets /
 
 # install runtime system dependencies, collected from install.sh scripts
 RUN ibek support apt-install --runtime
 
-# add startup scripts
-COPY ioc ${IOC}
-
 ENV TARGET_ARCHITECTURE ${TARGET_ARCHITECTURE}
 
 ENTRYPOINT ["/bin/bash", "-c", "${IOC}/start.sh"]