Skip to content

Commit

Permalink
add opi_auto volume
Browse files Browse the repository at this point in the history
as a workaround to podman's inability to use sub_path volume
mounts

see containers/podman#20661
  • Loading branch information
gilesknap committed Jun 30, 2024
1 parent 4e89d0d commit eef7f2f
Show file tree
Hide file tree
Showing 11 changed files with 4,458 additions and 10 deletions.
7 changes: 4 additions & 3 deletions include/init.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
#!/bin/sh

# The init service shell script - initialises the opi volume with any custom
# The init service shell script - initialises the opi volumes with any custom
# bob files from this repo and ensures that each IOC has a subfolder in the
# volume.
# volumes.

# copy in any opi files from the repo
cp -r /repo/opi/* /opi;

# make sure there is a subfolder of opi volume for each service
# make sure there is a subfolder of opi volumes for each service
cd /repo/services
for i in *; do
echo adding folder $i to opi volume
mkdir -p /opi/$i;
mkdir -p /opi_auto/$i;
done
1 change: 1 addition & 0 deletions include/init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ services:
volumes:
- opi:/opi/
- opi_auto:/opi_auto/
- ..:/repo
4 changes: 0 additions & 4 deletions include/ioc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
#
# For use with 'extends' in each individual IOC service description

include:
- networks.yml
- volumes.yml

services:

# linux IOCs that run in a container ##########################################
Expand Down
3 changes: 3 additions & 0 deletions include/volumes.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
volumes:
# hand coded opi files from this repo
opi:
# auto generated opi files created by pvi in each IOC
opi_auto:
4 changes: 3 additions & 1 deletion opi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ OPI Folders for IOCs

If required, hand coded bob files can be added here for each IOC in a subfolder with the same name as the IOC. These folders are copied in to the 'opi' volume by the init_epics container.

PVI autogenerated bob files will then be added to these folders in the opi volume as each IOC launches.
PVI autogenerated bob files will then be added to these folders in the opi volume as each IOC launches.

NOTE: because podman does not currently support sub_path volume mounts - we place all of the generated files for this project in here and refer to those from phoebus. See this issue for details: https://github.com/containers/podman/issues/20661
Loading

0 comments on commit eef7f2f

Please sign in to comment.