Skip to content

Commit

Permalink
fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Nov 30, 2024
1 parent 6d203ce commit ab04233
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 29 deletions.
26 changes: 1 addition & 25 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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]
Expand Down
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions pvagw/pvagw-launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/bl01t-launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ab04233

Please sign in to comment.