Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename auto gen bobs #50

Merged
merged 3 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
7 changes: 7 additions & 0 deletions .devcontainer/initializeCommand
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion compose/services/phoebus/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.