Skip to content

Commit a669638

Browse files
guirodrigueslimaguirodrigueslima
committed
images: Change in IOC build process
Docker Compose files (mca, motorpaker, motorpigcs2 and opcua) were restructured to support the new IOC build method. The docker-compose-mca.yml file was replaced by docker-compose-mca-amptek.yml, since only Amptek modules were added to the IOC build.
1 parent 93eaeb8 commit a669638

File tree

7 files changed

+126
-25
lines changed

7 files changed

+126
-25
lines changed

‎.github/workflows/base-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
docker-compose-opcua.yml
6464
docker-compose-motorpigcs2.yml
6565
docker-compose-motorparker.yml
66-
docker-compose-mca.yml
66+
docker-compose-mca-amptek.yml
6767
docker-compose-ca-gateway.yml
6868
docker-compose-pvagw.yml
6969
push: ${{ github.event_name == 'push' && vars.PUSH_TO_REGISTRY == 'true' && github.ref_type == 'tag' }}

‎CHANGES.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
https://github.com/cnpem/epics-in-docker/pull/123
99
* base: New method for IOC build. by @guirodrigueslima in
1010
https://github.com/cnpem/epics-in-docker/pull/133
11+
* images: Change in IOC build process. by @guirodrigueslima in
12+
https://github.com/cnpem/epics-in-docker/pull/133
1113

1214
## v0.14.1
1315

‎images/docker-compose-mca-amptek.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
services:
2+
mca:
3+
image: ghcr.io/cnpem/mca-amptek-epics-ioc:$TAG
4+
build:
5+
context: ./
6+
dockerfile: ../Dockerfile
7+
target: dynamic-link
8+
labels:
9+
org.opencontainers.image.source: https://github.com/cnpem/epics-in-docker
10+
args:
11+
RUNTIME_PACKAGES: libpcap0.8 libnet1 libusb-1.0-0
12+
REPONAME: mca
13+
APP_DIRS: /opt/mca
14+
IOC_NAME: Amptek
15+
RUNDIR: /opt/mca/iocBoot/iocAmptek
16+
IOC_DBD:
17+
base.dbd
18+
mcaAmptekSupport.dbd
19+
mcaSupport.dbd
20+
asyn.dbd
21+
drvAsynSerialPort.dbd
22+
drvAsynIPPort.dbd
23+
calcSupport.dbd
24+
asSupport.dbd
25+
busySupport.dbd
26+
sscanSupport.dbd
27+
IOC_LIB:
28+
mcaAmptek
29+
mca
30+
calc autosave
31+
sscan busy
32+
asyn
33+
seq pv
34+
IOC_DB:
35+
/opt/epics/modules/mca/db/Amptek.db
36+
/opt/epics/modules/mca/db/Amptek_SCAn.db
37+
/opt/epics/modules/mca/db/mca.db
38+
IOC_CMD:
39+
/opt/epics/modules/mca/iocBoot/iocAmptek/Amptek_SCAs.substitutions
40+
/opt/epics/modules/mca/iocBoot/iocAmptek/DP5
41+
/opt/epics/modules/mca/iocBoot/iocAmptek/GammaRay
42+
/opt/epics/modules/mca/iocBoot/iocAmptek/MCA8000D
43+
/opt/epics/modules/mca/iocBoot/iocAmptek/Makefile
44+
/opt/epics/modules/mca/iocBoot/iocAmptek/PX5
45+
/opt/epics/modules/mca/iocBoot/iocAmptek/auto_settings.req
46+
/opt/epics/modules/mca/iocBoot/iocAmptek/capture_packets
47+
/opt/epics/modules/mca/iocBoot/iocAmptek/envPaths
48+
/opt/epics/modules/mca/iocBoot/iocAmptek/st.cmd
49+
/opt/epics/modules/mca/iocBoot/iocAmptek/st.cmd.linux
50+
/opt/epics/modules/mca/iocBoot/iocAmptek/st.cmd.windows
51+
/opt/epics/modules/mca/iocBoot/iocAmptek/st_base.cmd
52+
/opt/epics/modules/mca/iocBoot/iocAmptek/st_md.cmd
53+
/opt/epics/modules/mca/iocBoot/iocAmptek/st_usb.cmd

‎images/docker-compose-mca.yml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎images/docker-compose-motorparker.yml‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,40 @@ services:
44
build:
55
context: ./
66
dockerfile: ../Dockerfile
7-
target: no-build
7+
target: dynamic-link
88
labels:
99
org.opencontainers.image.source: https://github.com/cnpem/epics-in-docker
1010
args:
11-
APP_DIRS: /opt/epics/modules/motorParker/iocs/parkerIOC
12-
RUNDIR: /opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker
11+
REPONAME: motorParker
12+
APP_DIRS: /opt/motorParker
13+
IOC_NAME: Parker
14+
RUNDIR: /opt/motorParker/iocBoot/iocParker
15+
IOC_DBD:
16+
base.dbd
17+
asyn.dbd
18+
drvAsynSerialPort.dbd
19+
drvAsynIPPort.dbd
20+
motorSupport.dbd
21+
ParkerSupport.dbd
22+
IOC_LIB:
23+
Parker
24+
motor
25+
asyn
26+
IOC_DB:
27+
/opt/epics/modules/motorParker/db/ACRAuxBi.template
28+
/opt/epics/modules/motorParker/db/ACRAuxBoRBV.template
29+
/opt/epics/modules/motorParker/db/ACRAuxBo.template
30+
/opt/epics/modules/motorParker/db/ACRAuxLi.template
31+
/opt/epics/modules/motorParker/db/ACRAuxRead.template
32+
/opt/epics/modules/motorParker/db/ACRAux.template
33+
/opt/epics/modules/motorParker/db/OEMLimitSwitch.template
34+
IOC_CMD:
35+
/opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/PC6K-postInit.cmd
36+
/opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/PC6K.cmd
37+
/opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/PC6K.substitutions
38+
/opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/envPaths
39+
/opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/motor.substitutions.acr
40+
/opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/motor.substitutions.oem
41+
/opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/st.cmd
42+
/opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/st.cmd.acr
43+
/opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/st.cmd.oem

‎images/docker-compose-motorpigcs2.yml‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,34 @@
11
services:
2-
motor-pigcs2:
2+
motorpigcs2:
33
image: ghcr.io/cnpem/motor-pigcs2-epics-ioc:$TAG
44
build:
55
context: ./
66
dockerfile: ../Dockerfile
7-
target: no-build
7+
target: dynamic-link
88
labels:
99
org.opencontainers.image.source: https://github.com/cnpem/epics-in-docker
1010
args:
11-
APP_DIRS: /opt/epics/modules/motor/modules/motorPIGCS2/iocs/pigcs2IOC
12-
RUNDIR: /opt/epics/modules/motor/modules/motorPIGCS2/iocs/pigcs2IOC/iocBoot/iocPIGCS2
11+
REPONAME: motorPIGCS2
12+
APP_DIRS: /opt/motorPIGCS2
13+
IOC_NAME: PIGCS2
14+
RUNDIR: /opt/motorPIGCS2/iocBoot/iocPIGCS2
15+
IOC_DBD:
16+
base.dbd
17+
asyn.dbd
18+
drvAsynSerialPort.dbd
19+
drvAsynIPPort.dbd
20+
motorSupport.dbd
21+
PI_GCS2Support.dbd
22+
IOC_LIB:
23+
PI_GCS2Support
24+
motor
25+
asyn
26+
IOC_DB:
27+
/opt/epics/modules/motor/modules/motorPIGCS2/pigcs2App/Db/PI_Support.db
28+
/opt/epics/modules/motor/modules/motorPIGCS2/pigcs2App/Db/PI_SupportCL.db
29+
/opt/epics/modules/motor/modules/motorPIGCS2/pigcs2App/Db/PI_SupportCtrl.db
30+
/opt/epics/modules/motor/modules/motorPIGCS2/pigcs2App/Db/PI_SupportError.db
31+
IOC_CMD:
32+
/opt/epics/modules/motor/modules/motorPIGCS2/iocs/pigcs2IOC/iocBoot/iocPIGCS2/st.cmd
33+
/opt/epics/modules/motor/modules/motorPIGCS2/iocs/pigcs2IOC/iocBoot/iocPIGCS2/PI_GCS2.cmd
34+
/opt/epics/modules/motor/modules/motorPIGCS2/iocs/pigcs2IOC/iocBoot/iocPIGCS2/PI_GCS2.substitutions

‎images/docker-compose-opcua.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ services:
44
build:
55
context: ./
66
dockerfile: ../Dockerfile
7-
target: no-build
7+
target: dynamic-link
88
labels:
99
org.opencontainers.image.source: https://github.com/cnpem/epics-in-docker
1010
args:
11-
APP_DIRS: /opt/epics/modules/opcua
12-
RUNDIR: /opt/epics/modules/opcua/iocBoot/iocUaDemoServer
13-
RUNTIME_PACKAGES: libxml2 libssl3
11+
REPONAME: opcua
12+
APP_DIRS: /opt/opcua
13+
IOC_NAME: opcuaIoc
14+
RUNDIR: /opt/opcua/iocBoot/iocopcuaIoc
15+
IOC_DBD:
16+
base.dbd
17+
opcua.dbd
18+
IOC_LIB:
19+
opcua

0 commit comments

Comments
 (0)