File tree Expand file tree Collapse file tree 8 files changed +45
-3
lines changed Expand file tree Collapse file tree 8 files changed +45
-3
lines changed Original file line number Diff line number Diff line change 29
29
uses : docker/bake-action@v4
30
30
with :
31
31
workdir : images/
32
- files : docker-compose-opcua.yml docker-compose-motorpigcs2.yml
32
+ files : docker-compose-opcua.yml docker-compose-motorpigcs2.yml docker-compose-mca.yml
33
33
push : true
Original file line number Diff line number Diff line change 2
2
3
3
## Unreleased
4
4
5
- * base: Pmac module version update and Add motorPIGCS2 IOC. by @guirodrigueslima
5
+ * base: Pmac module version update, add motorPIGCS2 and MCA IOC. by @guirodrigueslima in
6
+ https://github.com/cnpem/epics-in-docker/pull/64
6
7
7
8
## v0.8.0
8
9
Original file line number Diff line number Diff line change @@ -16,6 +16,8 @@ IPAC_VERSION=2.16
16
16
CAPUTLOG_VERSION = R4.0
17
17
RETOOLS_VERSION = b7abe82533cdbd7ddbc2dc845c95a2c51b7f2db9
18
18
ETHER_IP_VERSION = ether_ip-3-3
19
+ SCALER_VERSION = 4.1
20
+ MCA_VERSION = R7-10
19
21
20
22
AREA_DETECTOR_VERSION = R3-12-1
21
23
NDSSCPIMEGA_VERSION = 1.0.0
Original file line number Diff line number Diff line change @@ -18,6 +18,8 @@ RUN apt update -y && \
18
18
libusb-1.0-0-dev \
19
19
libxml2-dev \
20
20
libssl-dev \
21
+ libnet-dev \
22
+ libpcap-dev \
21
23
re2c \
22
24
wget \
23
25
ca-certificates
@@ -52,6 +54,8 @@ ARG IPAC_VERSION
52
54
ARG CAPUTLOG_VERSION
53
55
ARG RETOOLS_VERSION
54
56
ARG ETHER_IP_VERSION
57
+ ARG SCALER_VERSION
58
+ ARG MCA_VERSION
55
59
56
60
COPY caputlog-waveform-fix.patch .
57
61
COPY install_modules.sh .
Original file line number Diff line number Diff line change @@ -31,3 +31,5 @@ services:
31
31
MOTOR_VERSION : ${MOTOR_VERSION}
32
32
PMAC_VERSION : ${PMAC_VERSION}
33
33
OPCUA_VERSION : ${OPCUA_VERSION}
34
+ SCALER_VERSION : ${SCALER_VERSION}
35
+ MCA_VERSION : ${MCA_VERSION}
Original file line number Diff line number Diff line change @@ -65,3 +65,19 @@ EPICS_BASE
65
65
install_from_github -i epics-modules ether_ip ETHER_IP $ETHER_IP_VERSION "
66
66
EPICS_BASE
67
67
"
68
+
69
+ install_from_github -i epics-modules scaler SCALER $SCALER_VERSION "
70
+ EPICS_BASE
71
+ ASYN
72
+ "
73
+
74
+ install_from_github -i epics-modules mca MCA $MCA_VERSION "
75
+ EPICS_BASE
76
+ CALC
77
+ SSCAN
78
+ BUSY
79
+ SCALER
80
+ SNCSEQ
81
+ AUTOSAVE
82
+ ASYN
83
+ "
Original file line number Diff line number Diff line change @@ -22,7 +22,9 @@ RUN apk add --no-cache \
22
22
meson \
23
23
re2c \
24
24
readline-dev \
25
- readline-static
25
+ readline-static \
26
+ libnet-dev \
27
+ libpcap-dev
26
28
27
29
COPY lnls-get-n-unpack.sh /usr/local/bin/lnls-get-n-unpack
28
30
COPY lnls-run.sh /usr/local/bin/lnls-run
@@ -52,6 +54,8 @@ ARG IPAC_VERSION
52
54
ARG CAPUTLOG_VERSION
53
55
ARG RETOOLS_VERSION
54
56
ARG ETHER_IP_VERSION
57
+ ARG SCALER_VERSION
58
+ ARG MCA_VERSION
55
59
56
60
WORKDIR ${EPICS_MODULES_PATH}
57
61
COPY caputlog-waveform-fix.patch .
Original file line number Diff line number Diff line change
1
+ services :
2
+ ioc :
3
+ image : ghcr.io/cnpem/mca-epics-ioc:$TAG
4
+ build :
5
+ context : ./
6
+ dockerfile : ../Dockerfile
7
+ target : no-build
8
+ labels :
9
+ org.opencontainers.image.source : https://github.com/cnpem/epics-in-docker
10
+ args :
11
+ REPONAME : mca
12
+ RUNDIR : /opt/epics/modules/mca/iocBoot/iocAmptek
13
+ RUNTIME_PACKAGES :
You can’t perform that action at this time.
0 commit comments