base: Add MCA IOC

- The MCA IOC was added to module, it was necessary to install libnet and libpcap libraries. - The IOC was built and created the docker-compose-mca.yml file to generate new container image.
cnpem · May 22, 2024 · ccc57b5 · ccc57b5
1 parent d41233d
commit ccc57b5
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 2 deletions.
diff --git a/.github/workflows/included-images.yml b/.github/workflows/included-images.yml
@@ -32,4 +32,5 @@ jobs:
           files: |
             docker-compose-opcua.yml
             docker-compose-motorpigcs2.yml
+            docker-compose-mca.yml
           push: true
diff --git a/CHANGES.md b/CHANGES.md
@@ -15,6 +15,8 @@
   https://github.com/cnpem/epics-in-docker/pull/64
 * base: Add scaler module. by @guirodrigueslima in 
   https://github.com/cnpem/epics-in-docker/pull/64
+* base: Add MCA IOC, and image. by @guirodrigueslima in
+  https://github.com/cnpem/epics-in-docker/pull/64
 
 ## v0.8.0
 

diff --git a/base/.env b/base/.env
@@ -19,6 +19,7 @@ ETHER_IP_VERSION=ether_ip-3-3
 IOCSTATS_VERSION=3.2.0
 IPMICOMM_VERSION=R4.6.0
 SCALER_VERSION=4.1
+MCA_VERSION=R7-10
 
 AREA_DETECTOR_VERSION=R3-12-1
 NDSSCPIMEGA_VERSION=1.0.0

diff --git a/base/Dockerfile b/base/Dockerfile
@@ -12,12 +12,14 @@ RUN apt update -y && \
         git \
         libaravis-dev \
         libevent-dev \
+        libnet-dev \
+        libpcap-dev \
         libreadline-dev \
         libssh2-1-dev \
+        libssl-dev \
         libtiff-dev \
         libusb-1.0-0-dev \
         libxml2-dev \
-        libssl-dev \
         re2c \
         wget \
         ca-certificates
@@ -55,6 +57,7 @@ ARG ETHER_IP_VERSION
 ARG IOCSTATS_VERSION
 ARG IPMICOMM_VERSION
 ARG SCALER_VERSION
+ARG MCA_VERSION
 
 COPY ipmicomm.patch .
 COPY caputlog-waveform-fix.patch .

diff --git a/base/docker-compose.yml b/base/docker-compose.yml
@@ -34,4 +34,5 @@ services:
         PIGCS2_VERSION: ${PIGCS2_VERSION}
         PMAC_VERSION: ${PMAC_VERSION}
         OPCUA_VERSION: ${OPCUA_VERSION}
-        SCALER_VERSION : ${SCALER_VERSION}
+        SCALER_VERSION: ${SCALER_VERSION}
+        MCA_VERSION: ${MCA_VERSION}
diff --git a/base/install_modules.sh b/base/install_modules.sh
@@ -81,3 +81,15 @@ install_from_github epics-modules scaler SCALER $SCALER_VERSION "
 EPICS_BASE
 ASYN
 "
+
+install_from_github -i epics-modules mca MCA $MCA_VERSION "
+EPICS_BASE
+CALC
+SSCAN
+BUSY
+SCALER
+SNCSEQ
+AUTOSAVE
+ASYN
+MCA
+"
diff --git a/base/musl/Dockerfile b/base/musl/Dockerfile
@@ -9,8 +9,11 @@ RUN apk add --no-cache \
     g++ \
     libevent-dev \
     libevent-static \
+    libnet-dev \
+    libpcap-dev \
     libtirpc-dev \
     libtirpc-static \
+    libusb-dev \
     linux-headers \
     make \
     musl-dev \
@@ -55,6 +58,7 @@ ARG ETHER_IP_VERSION
 ARG IOCSTATS_VERSION
 ARG IPMICOMM_VERSION
 ARG SCALER_VERSION
+ARG MCA_VERSION
 
 WORKDIR ${EPICS_MODULES_PATH}
 COPY ipmicomm.patch .

diff --git a/base/musl/docker-compose.yml b/base/musl/docker-compose.yml
@@ -28,3 +28,4 @@ services:
         IOCSTATS_VERSION: ${IOCSTATS_VERSION}
         IPMICOMM_VERSION: ${IPMICOMM_VERSION}
         SCALER_VERSION : ${SCALER_VERSION}
+        MCA_VERSION: ${MCA_VERSION}
diff --git a/images/docker-compose-mca.yml b/images/docker-compose-mca.yml
@@ -0,0 +1,13 @@
+services:
+  ioc:
+    image: ghcr.io/cnpem/mca-epics-ioc:$TAG
+    build:
+      context: ./
+      dockerfile: ../Dockerfile
+      target: no-build
+      labels:
+        org.opencontainers.image.source: https://github.com/cnpem/epics-in-docker
+      args:
+        REPONAME: mca
+        RUNDIR: /opt/epics/modules/mca/iocBoot/iocAmptek
+        RUNTIME_PACKAGES: libusb-1.0-0