Skip to content

Commit ed5e76f

Browse files
authored
Merge pull request #148 from epics-containers/updates
fixes for latest change to ioc-template
2 parents 93cb0ca + b128457 commit ed5e76f

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

docs/how-to/phoebus.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
Phoebus is a Java application that can be used to view operator interfaces.
44

5-
epics-containers will support auto generation of engineering screens for
6-
Phoebus using [PVI](https://github.com/epics-containers/pvi).
7-
This is the initial target for epics-containers GUIs, other OPI
8-
formats may be supported in the future.
5+
epics-containers supports auto generation of engineering screens for Phoebus using [PVI](https://github.com/epics-containers/pvi). This is the initial target for epics-containers GUIs, other OPI formats may be supported in the future.
96

10-
OPI file generation is work in progress and this page will be updated when
11-
it is ready (est Feb 2024).
7+
Auto-generation of engineering screens is now supported in generic IOCs.
8+
9+
See here for an example https://github.com/epics-containers/example-services.

docs/how-to/update_generic_ioc.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
This requires that you have copier in your path which you can do by activating a virtual environment and installing it.
44

55
```bash
6+
python3 -m venv venv
7+
source venv/bin/activate
68
pip install copier
79
```
810

9-
Then you can run the following command to update your generic IOC to the latest template, this example for ioc-adaravis.
11+
Then you can run the following commands to update your generic IOC to the latest template, this example for ioc-adaravis.
1012

1113
```bash
12-
git clone ioc-adaravis --recursive
14+
git clone [email protected]:epics-containers/ioc-adaravis --recursive
1315
cd ioc-adaravis
1416
git checkout -b update-template
1517
copier update --trust

docs/tutorials/create_ioc.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ code .
3838

3939
Our new example IOC will be a simulation detector using the AreaDetector SimDetector. There is already a Generic IOC for the SimDetector, therefore to create an IOC Instance, we just need to refer to that Generic IOC container image and provide some configuration for it.
4040

41-
You can find the Generic IOC container source for SimDetector here: <https://github.com/epics-containers/ioc-adsimdetector>. This repository publishes its container image at: `ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.8.2`. Later tutorials will cover how to build and publish your own Generic IOC container images.
41+
You can find the Generic IOC container source for SimDetector here: <https://github.com/epics-containers/ioc-adsimdetector>. This repository publishes its container image at: `ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.9.1`. Later tutorials will cover how to build and publish your own Generic IOC container images.
4242

4343
Edit the `compose.yml` file in the `bl01t-ea-cam-01` folder to reflect the new IOC name and to refer to the Generic IOC container image for the SimDetector:
4444

4545
- find and replace **replace_me** with **bl01t-ea-cam-01**
46-
- replace **replace_with_image_uri** with **ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.8.2**
46+
- replace **replace_with_image_uri** with **ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.9.1**
4747

4848
That's it for the `compose.yml` file. This file is essentially boilerplate and would look very similar for every IOC Instance you create. The two unique things that this file does are:
4949
- determine the name of the IOC
@@ -60,7 +60,7 @@ services:
6060
service: linux_ioc
6161
file: ../../include/ioc.yml
6262

63-
image: ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.8.2
63+
image: ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.9.1
6464

6565
labels:
6666
version: 0.1.0
@@ -70,7 +70,7 @@ services:
7070
IOC_NAME: bl01t-ea-cam-01
7171

7272
volumes:
73-
- ../../opi/iocs/bl01t-ea-cam-01:/epics/opi
73+
- ../../opiauto-generated/bl01t-ea-cam-01:/epics/opi
7474

7575
configs:
7676
- source: bl01t-ea-cam-01_config

0 commit comments

Comments
 (0)