Skip to content

Commit 7024dfb

Browse files
base: Add MCA IOC
- The MCA IOC was added to module, it was necessary to install IOC Scaler and the libnet and libpcap libraries. - The IOC was built and created the docker-compose-mca.yml file to generate new container image.
1 parent 156ac68 commit 7024dfb

File tree

8 files changed

+45
-3
lines changed

8 files changed

+45
-3
lines changed

.github/workflows/included-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ jobs:
2929
uses: docker/bake-action@v4
3030
with:
3131
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
3333
push: true

CHANGES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
## Unreleased
44

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
67

78
## v0.8.0
89

base/.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ IPAC_VERSION=2.16
1616
CAPUTLOG_VERSION=R4.0
1717
RETOOLS_VERSION=b7abe82533cdbd7ddbc2dc845c95a2c51b7f2db9
1818
ETHER_IP_VERSION=ether_ip-3-3
19+
SCALER_VERSION=4.1
20+
MCA_VERSION=R7-10
1921

2022
AREA_DETECTOR_VERSION=R3-12-1
2123
NDSSCPIMEGA_VERSION=1.0.0

base/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ RUN apt update -y && \
1818
libusb-1.0-0-dev \
1919
libxml2-dev \
2020
libssl-dev \
21+
libnet-dev \
22+
libpcap-dev \
2123
re2c \
2224
wget \
2325
ca-certificates
@@ -52,6 +54,8 @@ ARG IPAC_VERSION
5254
ARG CAPUTLOG_VERSION
5355
ARG RETOOLS_VERSION
5456
ARG ETHER_IP_VERSION
57+
ARG SCALER_VERSION
58+
ARG MCA_VERSION
5559

5660
COPY caputlog-waveform-fix.patch .
5761
COPY install_modules.sh .

base/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ services:
3131
MOTOR_VERSION: ${MOTOR_VERSION}
3232
PMAC_VERSION: ${PMAC_VERSION}
3333
OPCUA_VERSION: ${OPCUA_VERSION}
34+
SCALER_VERSION: ${SCALER_VERSION}
35+
MCA_VERSION: ${MCA_VERSION}

base/install_modules.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,19 @@ EPICS_BASE
6565
install_from_github -i epics-modules ether_ip ETHER_IP $ETHER_IP_VERSION "
6666
EPICS_BASE
6767
"
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+
"

base/musl/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ RUN apk add --no-cache \
2222
meson \
2323
re2c \
2424
readline-dev \
25-
readline-static
25+
readline-static \
26+
libnet-dev \
27+
libpcap-dev
2628

2729
COPY lnls-get-n-unpack.sh /usr/local/bin/lnls-get-n-unpack
2830
COPY lnls-run.sh /usr/local/bin/lnls-run
@@ -52,6 +54,8 @@ ARG IPAC_VERSION
5254
ARG CAPUTLOG_VERSION
5355
ARG RETOOLS_VERSION
5456
ARG ETHER_IP_VERSION
57+
ARG SCALER_VERSION
58+
ARG MCA_VERSION
5559

5660
WORKDIR ${EPICS_MODULES_PATH}
5761
COPY caputlog-waveform-fix.patch .

images/docker-compose-mca.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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:

0 commit comments

Comments
 (0)