Skip to content

Commit

Permalink
add pvacess support
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Nov 30, 2024
1 parent d8e73f7 commit 3158597
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
5 changes: 4 additions & 1 deletion template/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@
// To access two devcontainers from the host for example:
// EPICS_CA_ADDR_LIST="127.0.0.1:5064 127.0.0.1:6064"
"127.0.0.1:5064:5064/udp",
"127.0.0.1:5064-5065:5064-5065"
"127.0.0.1:5064-5065:5064-5065",
// "127.0.0.1:5076:5076/udp", PVA UDP does not work into container network
// expose pva name server access via TCP
"5075-5076:5075-5076"
],
// Mount the parent of the project folder so we can access peer projects
"workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces,type=bind",
Expand Down
8 changes: 4 additions & 4 deletions template/opi/phoebus-launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ else

# prefer docker but use podman if USE_PODMAN is set
if docker version &> /dev/null && [[ -z $USE_PODMAN ]]
then docker=docker
else docker=podman
then docker=docker; UIDGID=$(id -u):$(id -g)
else docker=podman; UIDGID=0:0
fi
echo "Using $docker as container runtime"

Expand All @@ -35,8 +35,8 @@ else

# settings for container launch
x11="-e DISPLAY --net host"
args=$"--rm -it --security-opt=label=none"
mounts="-v=/tmp:/tmp -v=${workspace}:/workspace"
args="--rm -it --security-opt=label=none --user ${UIDGID}"
mounts="-v=/tmp:/tmp -v=${workspace}:/workspace -v=${workspace}/..:/workspaces"
image="ghcr.io/epics-containers/ec-phoebus:latest"

settings="
Expand Down
1 change: 1 addition & 0 deletions template/opi/settings.ini
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# point at local host for channel access
org.phoebus.pv.ca/addr_list=127.0.0.1
org.phoebus.pv.pva/epics_pva_name_servers=127.0.0.1

0 comments on commit 3158597

Please sign in to comment.