From 1f14e0a6ed6976df11b038686b75b2284b634a6a Mon Sep 17 00:00:00 2001
From: Giles Knap <giles.knap@diamond.ac.uk>
Date: Sun, 30 Jun 2024 16:40:36 +0100
Subject: [PATCH] got gateway and podman working

---
 include/ioc.yml              | 14 ++++----------
 services/gateway/compose.yml |  5 ++++-
 services/phoebus/compose.yml |  6 ++++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/include/ioc.yml b/include/ioc.yml
index 2de7c06..0f6eb33 100644
--- a/include/ioc.yml
+++ b/include/ioc.yml
@@ -3,10 +3,8 @@
 # For use with 'extends' in each individual IOC service description
 
 services:
-
- # linux IOCs that run in a container ##########################################
+  # linux IOCs that run in a container #########################################
   linux_ioc: &linux_ioc
-
     depends_on:
       - init_iocs
 
@@ -43,12 +41,12 @@ services:
       - "5064-5065/udp"
       - "5064-5065"
 
-# proxy services that each manage an RTEMS hard IOC ############################
+  # proxy services that each manage an RTEMS hard IOC ##########################
   rtems_ioc:
-
-    # use an alias to copy all of the linux_ioc spec and add RTEMS environment
+    # use an alias to copy all of the linux_ioc spec
     <<: *linux_ioc
 
+    # and add RTEMS environment variables
     environment:
       RTEMS_ROOT_NFS: /nfsv2-tftp
       RTEMS_ROOT_TFTP: /nfsv2-tftp
@@ -58,7 +56,3 @@ services:
       # But may need to move these to individual IOCs for the Machine.
       RTEMS_IOC_NETMASK": 255.255.240.0
       RTEMS_IOC_GATEWAY": 172.23.240.254
-
-
-
-
diff --git a/services/gateway/compose.yml b/services/gateway/compose.yml
index 5f657c6..455da86 100644
--- a/services/gateway/compose.yml
+++ b/services/gateway/compose.yml
@@ -12,10 +12,12 @@ services:
     image: docker.io/pklaus/ca-gateway
     container_name: ca-gateway
     expose:
+      # podman gets 'rootlessport listen udp 0.0.0.0:5065: bind: address already in use'
+      # when we add the 5065 port here - TODO, diagnose
       - "5064-5065/udp"
       - "5064-5065"
     ports:
-      - "5064-5065:5064-5065/udp"
+      - "5064:5064/udp"
       - "5064-5065:5064-5065"
     restart: unless-stopped
     networks:
@@ -30,6 +32,7 @@ services:
 
     profiles:
       - deploy
+      - develop
 
 configs:
   ca-gateway_config:
diff --git a/services/phoebus/compose.yml b/services/phoebus/compose.yml
index d4fef2e..88234dd 100644
--- a/services/phoebus/compose.yml
+++ b/services/phoebus/compose.yml
@@ -16,8 +16,10 @@ services:
     # IMPORTANT: set UIDGID to your host user:group e.g. 1000:1000
     # BUT: always to 0:0 if you are using podman
     user: ${UIDGID}
-    networks:
-      - channel_access
+
+    # network host with a gateway for CA is the most reliable way to
+    # get X11 forwarding to work - even with ssh->container
+    network_mode: host
 
     profiles:
       - develop