Skip to content

Commit

Permalink
use debug version of gateways
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Jul 26, 2024
1 parent a02e9a6 commit 4f0542f
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 11 deletions.
26 changes: 26 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,29 @@ These goals for switching to compose have all been met:
- structure so that there is a compose file per server
- remove need for custom code/scripts to deploy/manage the IOCs
- also allow PV isolation on servers with a ca-gateway to enable access

# host settings to talk to the IOCs via Gateways

## environment variables
```bash
export EPICS_CA_ADDR_LIST=127.0.0.1
export EPICS_PVA_ADDR_LIST=127.0.0.1
export EPICS_CA_AUTO_ADDR_LIST=NO
export EPICS_PVA_AUTO_ADDR_LIST=NO
```

## example PVs
```bash
caget BL01T-DI-CAM-01:DET:MaxSizeX_RBV

pvget BL01T-DI-CAM-01:PVA:OUTPUT
```

## environment to test gateways inside the container network

```bash
export EPICS_CA_ADDR_LIST=172.20.255.254
export EPICS_PVA_ADDR_LIST=172.20.255.250
export EPICS_CA_AUTO_ADDR_LIST=NO
export EPICS_PVA_AUTO_ADDR_LIST=NO
```
10 changes: 4 additions & 6 deletions include/ioc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,16 @@ services:

tty: true
stdin_open: true
restart: always
restart: unless-stopped

# for docker use 'networks: [channel_access]'
# for podman at DLS use 'network_mode: host'
# or for both use 'networks: [channel_access]'
# and ca-gateway + pvagw
network_mode: host

# TODO TEMPORARY until we get pva gateway working
# networks:
# - channel_access
# network_mode: host

networks:
- channel_access
expose:
- "5064-5065/udp"
- "5064-5065"
Expand Down
2 changes: 1 addition & 1 deletion services/gateway/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:

ca-gateway-develop: &ca-gateway

image: docker.io/pklaus/ca-gateway
image: ghcr.io/epics-containers/docker-ca-gateway-debug:2.1.3ec1

expose:
- 5064-5065/udp
Expand Down
2 changes: 1 addition & 1 deletion services/phoebus/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

services:
phoebus:
image: ghcr.io/epics-containers/ec-phoebus:latest
image: ghcr.io/epics-containers/ec-phoebus:4.7.3ec2
environment:
DISPLAY: $DISPLAY
tty: true
Expand Down
2 changes: 2 additions & 0 deletions services/phoebus/config/settings.ini
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# using localhost for channel access to isolate it to the host for development

# TODO restore this once we have PVA gateway and IOCS running in the CNI
org.phoebus.pv.ca/addr_list=127.0.0.1
2 changes: 1 addition & 1 deletion services/pvagw/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:

pvagw-develop: &pvagw

image: ghcr.io/epics-containers/ec-p4p:4.1.12ec1
image: ghcr.io/epics-containers/ec-p4p-debug:latest

expose:
- 5076/udp
Expand Down
4 changes: 2 additions & 2 deletions services/pvagw/config/pvagw.config
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
{
"name":"theserver",
"clients":["theclient"],
"interface":["127.0.0.1"],
"addrlist":"127.255.255.255",
/* "interface":["127.0.0.1"], */
/* "addrlist":"127.255.255.255", */
"autoaddrlist":false,
"serverport":5075,
"bcastport":5076,
Expand Down

0 comments on commit 4f0542f

Please sign in to comment.