base: Add MCA IOC

    - The MCA IOC  was added to module, it was necessary to install libnet and libpcap libraries.
    - It was observed that some IOC need to instance
      their own directory in the RELEASE file, for this reason the "dependency_name"
      is being added before get_module_path in the install_module() function.
    - The IOC was built and created the docker-compose-mca.yml file to generate new container image.

.github/workflows/included-images.yml

@@ -29,5 +29,5 @@ jobs:
         uses: docker/bake-action@v4
         with:
           workdir: images/
-          files: docker-compose-opcua.yml docker-compose-motorpigcs2.yml
+          files: docker-compose-opcua.yml docker-compose-motorpigcs2.yml docker-compose-mca.yml
           push: true

CHANGES.md

@@ -4,8 +4,8 @@
 
 ### New features
 
-* base: Pmac module version update, add motorPIGCS2 IOC and
-  add scaler IOC, and image.
+* base: Pmac module version update, add motorPIGCS2 IOC,
+  scaler IOC and MCA IOC, and images.
   by @guirodrigueslima in https://github.com/cnpem/epics-in-docker/pull/64
 
 ## v0.8.0

base/.env

@@ -17,6 +17,7 @@ CAPUTLOG_VERSION=R4.0
 RETOOLS_VERSION=b7abe82533cdbd7ddbc2dc845c95a2c51b7f2db9
 ETHER_IP_VERSION=ether_ip-3-3
 SCALER_VERSION=4.1
+MCA_VERSION=R7-10
 
 AREA_DETECTOR_VERSION=R3-12-1
 NDSSCPIMEGA_VERSION=1.0.0

base/Dockerfile

@@ -18,6 +18,8 @@ RUN apt update -y && \
         libusb-1.0-0-dev \
         libxml2-dev \
         libssl-dev \
+        libnet-dev \
+        libpcap-dev \
         re2c \
         wget \
         ca-certificates
@@ -53,6 +55,7 @@ ARG CAPUTLOG_VERSION
 ARG RETOOLS_VERSION
 ARG ETHER_IP_VERSION
 ARG SCALER_VERSION
+ARG MCA_VERSION
 
 COPY caputlog-waveform-fix.patch .
 COPY install_modules.sh .

base/docker-compose.yml

@@ -32,3 +32,5 @@ services:
         PIGCS2_VERSION: ${PIGCS2_VERSION}
         PMAC_VERSION: ${PMAC_VERSION}
         OPCUA_VERSION: ${OPCUA_VERSION}
+        SCALER_VERSION: ${SCALER_VERSION}
+        MCA_VERSION: ${MCA_VERSION}

base/install-functions.sh

@@ -28,6 +28,9 @@ install_module() {
     release_modules="$3"
 
     cd $module_name
+
+    echo ${dependency_name}=${PWD} >> ${EPICS_RELEASE_FILE}
+
     get_module_path "$release_modules" > configure/RELEASE
 
     if [ -n "$NEEDS_TIRPC" ]; then
@@ -40,8 +43,6 @@ install_module() {
         make -C iocBoot
     fi
 
-    echo ${dependency_name}=${PWD} >> ${EPICS_RELEASE_FILE}
-
     cd -
 }
 

base/install_modules.sh

@@ -70,3 +70,15 @@ install_from_github -i 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
+"

base/musl/Dockerfile

@@ -22,7 +22,10 @@ RUN apk add --no-cache \
     meson \
     re2c \
     readline-dev \
-    readline-static
+    readline-static \
+    libnet-dev \
+    libpcap-dev \
+    libusb-dev
 
 COPY lnls-get-n-unpack.sh /usr/local/bin/lnls-get-n-unpack
 COPY lnls-run.sh /usr/local/bin/lnls-run
@@ -53,6 +56,7 @@ ARG CAPUTLOG_VERSION
 ARG RETOOLS_VERSION
 ARG ETHER_IP_VERSION
 ARG SCALER_VERSION
+ARG MCA_VERSION
 
 WORKDIR ${EPICS_MODULES_PATH}
 COPY caputlog-waveform-fix.patch .

base/musl/docker-compose.yml

@@ -25,3 +25,5 @@ services:
         CAPUTLOG_VERSION: ${CAPUTLOG_VERSION}
         RETOOLS_VERSION: ${RETOOLS_VERSION}
         ETHER_IP_VERSION: ${ETHER_IP_VERSION}
+        SCALER_VERSION: ${SCALER_VERSION}
+        MCA_VERSION: ${MCA_VERSION}

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