From ab042339e65f125bc7965d98fc35ca6836cf6d06 Mon Sep 17 00:00:00 2001
From: giles knap <gilesknap@gmail.com>
Date: Sat, 30 Nov 2024 15:05:36 +0000
Subject: [PATCH] fix CI

---
 .github/workflows/build.yml | 26 +-------------------------
 Dockerfile                  |  3 ---
 pvagw/pvagw-launch.sh       |  3 +++
 services/bl01t-launch.sh    |  2 +-
 4 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c086a15..efe8f4e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,7 +53,7 @@ jobs:
         with:
           context: .
           platforms: ${{ matrix.platform }}
-          target: runtime
+          target: developer
           build-args: |
             IMAGE_EXT=${{ matrix.extension }}
           cache-from: type=gha,scope=${{ matrix.epics-target }}
@@ -78,30 +78,6 @@ jobs:
           tags: ${{ env.TAG }}-developer:${{ github.ref_name }}
           push: true
 
-      - name: Push runtime image
-        if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: ${{ matrix.platform }}
-          target: runtime
-          build-args: |
-            IMAGE_EXT=${{ matrix.extension }}
-          tags: ${{ env.TAG }}-runtime:${{ github.ref_name }}
-          push: true
-
-      - name: Push demo image
-        if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: ${{ matrix.platform }}
-          target: demo
-          build-args: |
-            IMAGE_EXT=${{ matrix.extension }}
-          tags: ${{ env.TAG }}-demo:${{ github.ref_name }}
-          push: true
-
   release:
     # Release on tag push - publish ioc schema
     needs: [build]
diff --git a/Dockerfile b/Dockerfile
index 504ccc7..871b8de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,3 @@ RUN ln -s /services/bl01t-ea-ioc-02/config /epics/ioc/config
 
 # run this container interactively
 ENTRYPOINT ["/bin/bash", "-c", "/pvagw/pvagw-launch.sh"]
-
-# add a dummy runtime stage - to keep build scripts the same as other IOCs
-FROM developer AS runtime
diff --git a/pvagw/pvagw-launch.sh b/pvagw/pvagw-launch.sh
index 6a40acb..d505959 100755
--- a/pvagw/pvagw-launch.sh
+++ b/pvagw/pvagw-launch.sh
@@ -10,6 +10,9 @@
 #
 this_dir=$(dirname $0)
 
+# docker takes a few seconds to get the network up ? podman is fine but
+# with docker the broadcast address was coming out as hosts
+sleep 3
 # determine the broadcast address of the container network
 broadcast=$(ifconfig | sed -rn 's/^.*broadcast (.*)$/\1/p')
 # add the broadcast address to the pva gateway config
diff --git a/services/bl01t-launch.sh b/services/bl01t-launch.sh
index cd5f5b8..350edf4 100755
--- a/services/bl01t-launch.sh
+++ b/services/bl01t-launch.sh
@@ -17,7 +17,7 @@ args="--rm -it"
 ca="-p 127.0.0.1:5064:5064/udp -p 127.0.0.1:5064-5065:5064-5065"
 pva="-p 127.0.0.1:5076:5076/udp -p 127.0.0.1:5075:5075"
 vols="-v /tmp:/tmp"
-image="ghcr.io/epics-containers/pvagw-demo:2024.11.1"
+image="ghcr.io/epics-containers/pva-demo-developer:2024.11.2"
 
 set -x
 $docker run $args $ca $pva $vols $image