Pmac module version update, add motorPIGCS2 and MCA IOC

.github/workflows/included-images.yml

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

CHANGES.md

@@ -7,6 +7,11 @@
 * base: remove CALC dependency on Sequencer. by @henriquesimoes in
   https://github.com/cnpem/epics-in-docker/pull/68.
 
+### Bug fixes
+
+* base: update PMAC version. by @guirodrigueslima in
+  https://github.com/cnpem/epics-in-docker/pull/64
+
 ### New features
 
 * base: add IOCStats module. by @gustavosr8 in
@@ -21,6 +26,12 @@
     `BUILD_TAR_PACKAGES`.
 * base: add SNMP module. by @guirodrigueslima in
   https://github.com/cnpem/epics-in-docker/pull/67
+* base: add motorPIGCS2 IOC and module, and image. by @guirodrigueslima in
+  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.1
 

README.md

@@ -18,6 +18,8 @@ Some IOC images are provided by this repository directly, and can be used
 without any build step.
 
 - OPCUA IOC: `ghcr.io/cnpem/opcua-epics-ioc`
+- MCA IOC: `ghcr.io/cnpem/mca-epics-ioc`
+- Motor PIGCS2 IOC: `ghcr.io/cnpem/motor-pigcs2-epics-ioc`
 
 ## IOC images
 

base/.env

@@ -20,12 +20,15 @@ IOCSTATS_VERSION=3.2.0
 IPMICOMM_VERSION=R4.6.0
 PYDEVSUP_VERSION=1.2
 SNMP_VERSION=1.1.0.4
+SCALER_VERSION=4.1
+MCA_VERSION=R7-10
 
 AREA_DETECTOR_VERSION=R3-12-1
 NDSSCPIMEGA_VERSION=1.0.0
 LIBSSCPIMEGA_VERSION=fb8acf533a7c01b5266bf32d60d1a5f923e19523
 
 MOTOR_VERSION=R7-3-1
-PMAC_VERSION=2-6-1
+PIGCS2_VERSION=60af8bdb17c1717e4545d8170f820e358ce31458
+PMAC_VERSION=2-6-4b3
 
 OPCUA_VERSION=0.9.4

base/Dockerfile

@@ -12,6 +12,8 @@ RUN apt update -y && \
         git \
         libaravis-dev \
         libevent-dev \
+        libnet-dev \
+        libpcap-dev \
         libreadline-dev \
         libssh2-1-dev \
         libtiff-dev \
@@ -60,6 +62,8 @@ ARG IOCSTATS_VERSION
 ARG IPMICOMM_VERSION
 ARG PYDEVSUP_VERSION
 ARG SNMP_VERSION
+ARG SCALER_VERSION
+ARG MCA_VERSION
 
 COPY ipmicomm.patch .
 COPY caputlog-waveform-fix.patch .
@@ -75,6 +79,7 @@ COPY install_area_detector.sh .
 RUN ./install_area_detector.sh
 
 ARG MOTOR_VERSION
+ARG PIGCS2_VERSION
 ARG PMAC_VERSION
 
 COPY install_motor.sh .

base/docker-compose.yml

@@ -29,9 +29,12 @@ services:
         IPMICOMM_VERSION: ${IPMICOMM_VERSION}
         PYDEVSUP_VERSION: ${PYDEVSUP_VERSION}
         SNMP_VERSION: ${SNMP_VERSION}
+        SCALER_VERSION: ${SCALER_VERSION}
+        MCA_VERSION: ${MCA_VERSION}
         AREA_DETECTOR_VERSION: ${AREA_DETECTOR_VERSION}
         NDSSCPIMEGA_VERSION: ${NDSSCPIMEGA_VERSION}
         LIBSSCPIMEGA_VERSION: ${LIBSSCPIMEGA_VERSION}
         MOTOR_VERSION: ${MOTOR_VERSION}
+        PIGCS2_VERSION: ${PIGCS2_VERSION}
         PMAC_VERSION: ${PMAC_VERSION}
         OPCUA_VERSION: ${OPCUA_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

@@ -89,3 +89,20 @@ cd ..
 install_module -i snmp SNMP "
 EPICS_BASE
 "
+
+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
+"

base/install_motor.sh

@@ -12,9 +12,15 @@ cd motor/modules
 git submodule update --init --depth 1 -j ${JOBS} \
     motorMotorSim
 
+git submodule update --init -j ${JOBS} \
+    motorPIGCS2
+
+git -C motorPIGCS2 checkout ${PIGCS2_VERSION}
+
 module_releases="
 MOTOR=${EPICS_MODULES_PATH}/motor
 MOTOR_MOTORSIM=${EPICS_MODULES_PATH}/motor/modules/motorMotorSim
+MOTOR_PIGCS2=${EPICS_MODULES_PATH}/motor/modules/motorPIGCS2
 "
 echo "$module_releases" >> ${EPICS_RELEASE_FILE}
 
@@ -37,6 +43,13 @@ cd ..
 make -j${JOBS}
 make clean
 
+install_module -i modules/motorPIGCS2/iocs/pigcs2IOC PIGCS2 "
+EPICS_BASE
+ASYN
+MOTOR
+SNCSEQ
+"
+
 cd $EPICS_MODULES_PATH
 
 download_from_github dls-controls pmac $PMAC_VERSION

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 \
@@ -59,6 +62,8 @@ ARG IOCSTATS_VERSION
 ARG IPMICOMM_VERSION
 ARG PYDEVSUP_VERSION
 ARG SNMP_VERSION
+ARG SCALER_VERSION
+ARG MCA_VERSION
 
 WORKDIR ${EPICS_MODULES_PATH}
 COPY ipmicomm.patch .

base/musl/docker-compose.yml

@@ -29,3 +29,5 @@ services:
         IPMICOMM_VERSION: ${IPMICOMM_VERSION}
         PYDEVSUP_VERSION: ${PYDEVSUP_VERSION}
         SNMP_VERSION: ${SNMP_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: libpcap0.8 libnet1 libusb-1.0-0

images/docker-compose-motorpigcs2.yml

@@ -0,0 +1,12 @@
+services:
+  ioc:
+    image: ghcr.io/cnpem/motor-pigcs2-epics-ioc:$TAG
+    build:
+      context: ./
+      dockerfile: ../Dockerfile
+      target: no-build
+      labels:
+        org.opencontainers.image.source: https://github.com/cnpem/epics-in-docker
+      args:
+        REPONAME: motorpigcs2
+        RUNDIR: /opt/epics/modules/motor/modules/motorPIGCS2/iocs/pigcs2IOC/iocBoot/iocPIGCS2