Skip to content

Commit a663e6a

Browse files
Merge pull request #42 from epics-containers/tidy-for-docs
Update containers to latest changes
2 parents a1b2d29 + 4feda3c commit a663e6a

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ docker compose up bl01t-di-cam-01 -d
6969
docker compose down
7070
```
7171

72+
NOTE: sometimes the pva-gateway will not terminate before `docker compose down` times out and you will see an error. If this happens then you can run `docker compose down` again and it should then remove the pva-gateway container.
73+
7274
# Deploy To Beamline Servers
7375

7476
TODO: although this will work for CA, there is not yet a solution for PVA. PVA UDP traffic will not route into a container. Two possible solutions are:

services/bl01t-di-cam-01/compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
service: linux_ioc
77
file: ../../include/ioc.yml
88

9-
image: ghcr.io/epics-containers/ioc-adsimdetector-runtime:2025.4.2b1
9+
image: ghcr.io/epics-containers/ioc-adsimdetector-runtime:2025.7.1b2
1010

1111
labels:
1212
version: 0.1.0
@@ -35,7 +35,7 @@ services:
3535

3636
bl01t-di-cam-01-dev:
3737
<<: *bl01t-di-cam-01
38-
image: ghcr.io/epics-containers/ioc-adsimdetector-developer:2025.3.5
38+
image: ghcr.io/epics-containers/ioc-adsimdetector-developer:2025.7.1b2
3939

4040
profiles:
4141
- devcontainer

services/bl01t-di-cam-01/config/ioc.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adsimdetector/releases/download/2025.3.4/ibek.ioc.schema.json
1+
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adsimdetector/releases/download/2025.7.1b2/ibek.ioc.schema.json
22

33
ioc_name: "{{ _global.get_env('IOC_NAME') }}"
44
description: Example simulated camera for BL01T
@@ -28,11 +28,11 @@ entities:
2828
dbpf BL01T-DI-CAM-01:PVA:EnableCallbacks 1
2929
dbpf BL01T-DI-CAM-01:DET:Acquire 1
3030
31-
- type: ffmpegServer.ffmpegStream
32-
PORT: DET.MJP
33-
P: BL01T-DI-CAM-01
34-
R: ":MJP:"
35-
NDARRAY_PORT: DET.DET
31+
# - type: ffmpegServer.ffmpegStream
32+
# PORT: DET.MJP
33+
# P: BL01T-DI-CAM-01
34+
# R: ":MJP:"
35+
# NDARRAY_PORT: DET.DET
3636

3737
- type: ADCore.NDROI
3838
PORT: DET.ROI
@@ -46,7 +46,7 @@ entities:
4646
R: ":PROC:"
4747
NDARRAY_PORT: DET.ROI
4848

49-
- type: ADCore.NDPvaPlugin
49+
- type: ADCore.NDPvxsPlugin
5050
PORT: DET.PVA
5151
PVNAME: BL01T-DI-CAM-01:PVA:OUTPUT
5252
P: BL01T-DI-CAM-01

services/bl01t-mo-sim-01/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
service: linux_ioc
77
file: ../../include/ioc.yml
88

9-
image: ghcr.io/epics-containers/ioc-motorsim-runtime:2025.3.1
9+
image: ghcr.io/epics-containers/ioc-motorsim-runtime:2025.7.3b1
1010

1111
labels:
1212
version: 0.1.0

0 commit comments

Comments
 (0)