use external network called channel_access

compose/environment.sh

@@ -31,6 +31,12 @@ if check_docker; then
     USER_ID=$(id -u); USER_GID=$(id -g)
 else
     USER_ID=0; USER_GID=0
+    alias docker=podman
+fi
+
+# make sure we have a network to share beteen the devcontainer and gateway container
+if ! docker network exists channel_access ; then
+    docker network create --subnet="170.20.0.0/16" channel_access
 fi
 
 # ensure local container users can access X11 server

compose/services/gateway/compose.yml

@@ -28,7 +28,7 @@ services:
       - source: ca-gateway_config
         target: /config
 
-    command: -cip 172.20.255.255 -pvlist /config/pvlist -access /config/access -log /dev/stdout -debug 1
+    command: -cip 170.20.255.255 -pvlist /config/pvlist -access /config/access -log /dev/stdout -debug 1
 
     profiles:
       - test
@@ -49,6 +49,6 @@ configs:
   ca-gateway_config:
     file: ./config
 
-include:
-  - path:
-      ../../include/networks.yml
+networks:
+  channel_access:
+    external: true

compose/services/phoebus/compose.yml

@@ -9,11 +9,11 @@ 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 -server 7010
+    command: phoebus-product/phoebus.sh -settings /config/settings.ini -resource /opi/ioc/index.bob -server 7010
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix
       - ~/.Xauthority:/root/.Xauthority
-      - ../../opi:/opi
+      - ../../../opi:/opi
     # for X11 to work we need to run as the same UID as the host
     # IMPORTANT: set UIDGID to your host user:group e.g. 1000:1000
     # BUT: always to 0:0 if you are using podman
@@ -30,7 +30,3 @@ services:
 configs:
   phoebus_config:
     file: ./config
-
-include:
-  - path:
-      ../../include/networks.yml