diff --git a/.copier-answers.yml b/.copier-answers.yml index f542d02..898eaa4 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: 3.6.1-4-g736b7c7 +_commit: 3.6.1-7-gb5b6581 _src_path: gh:epics-containers/ioc-template description: The simulation AreaDetector git_platform: github.com diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0ea8350..c369aa0 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -63,6 +63,6 @@ // in this way the devcontainer and runtime look very similar "source=${localWorkspaceFolder},target=/epics/generic-source,type=bind", // Mount the opi folder so we can use phoebus from outside the container - "source=${localWorkspaceFolder}/opi/ioc,target=/epics/opi,type=bind" + "source=${localWorkspaceFolder}/opi/auto-generated,target=/epics/opi,type=bind" ] } \ No newline at end of file diff --git a/.devcontainer/initializeCommand b/.devcontainer/initializeCommand index 732ec1f..5cd42cd 100644 --- a/.devcontainer/initializeCommand +++ b/.devcontainer/initializeCommand @@ -3,4 +3,11 @@ # custom initialization goes here - runs outside of the dev container # just before the container is launched but after the container is created +FOLDER=$(dirname $(readlink -f $0)) + echo "devcontainerID ${1}" + +# make sure the shared network is created +# TODO this would be better done with compose but compose and podman +# in devcontainers is not currently stable. +source $FOLDER/../compose/environment.sh diff --git a/.gitignore b/.gitignore index 10ff20f..ed6e374 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,8 @@ ibek # config folder is a container mount at /epics/ioc/config ioc/config # the opi folder is also mounted into the container at /epics/ioc/opi -opi/ioc/* -!opi/ioc/.placeholder +opi/auto-generated/* +!opi/auto-generated/.placeholder # podman may leave this around in aborted builds .build.swp diff --git a/compose/services/phoebus/compose.yml b/compose/services/phoebus/compose.yml index 8e18c07..0f759d7 100644 --- a/compose/services/phoebus/compose.yml +++ b/compose/services/phoebus/compose.yml @@ -9,7 +9,7 @@ services: DISPLAY: $DISPLAY tty: true # pick a server port for phoebus so it does not reconnect to existing phoebus - command: phoebus-product/phoebus.sh -settings /config/settings.ini -resource /opi/ioc/index.bob -server 7010 + command: phoebus-product/phoebus.sh -settings /config/settings.ini -resource /opi/auto-generated/index.bob -server 7010 volumes: - /tmp/.X11-unix:/tmp/.X11-unix - ~/.Xauthority:/root/.Xauthority diff --git a/opi/ioc/.placeholder b/opi/auto-generated/.placeholder similarity index 100% rename from opi/ioc/.placeholder rename to opi/auto-generated/.placeholder