Merge pull request #20 from epics-containers/gateways

update pvagw and gateway to use new gateways container image
epics-containers · Jan 7, 2025 · b0272d2 · b0272d2
2 parents 01b23bd + 9fcd159
commit b0272d2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/services/gateway/compose.yml b/services/gateway/compose.yml
@@ -13,7 +13,7 @@ services:
 
     container_name: ca-gateway
 
-    image: ghcr.io/epics-containers/docker-ca-gateway:2.1.3ec1
+    image: ghcr.io/epics-containers/gateways-developer:2024.12.3
 
     security_opt:
       - label=disable
@@ -37,7 +37,13 @@ services:
       - source: ca-gateway_config
         target: /config
 
-    command: -cip ${CA_BROADCAST} -pvlist /config/pvlist -access /config/access -log /dev/stdout -debug 1
+    command:
+      - bash
+      - -c
+      - >
+        /epics/ca-gateway/bin/linux-x86_64/gateway
+        -cip ${CA_BROADCAST} -pvlist /config/pvlist
+        -access /config/access -log /dev/stdout -debug 1
 
     profiles:
       - test

diff --git a/services/pvagw/compose.yml b/services/pvagw/compose.yml
@@ -7,7 +7,7 @@ services:
   pvagw: &pvagw
     container_name: pvagw
 
-    image: ghcr.io/epics-containers/ec-p4p:4.1.12ec1
+    image: ghcr.io/epics-containers/gateways-developer:2024.12.3
 
     depends_on:
       - init
@@ -31,7 +31,10 @@ services:
       - source: pvagw_config
         target: /config
 
-    command: -c "pvagw /config/pvagw.config --debug"
+    command:
+      - pvagw
+      - /config/pvagw.config
+      - --debug
 
     profiles:
       - test