From 1217ea467e1b8f783c20eac935139dd53466b4e4 Mon Sep 17 00:00:00 2001 From: Guilherme Rodrigues de Lima Date: Thu, 16 May 2024 14:39:03 -0300 Subject: [PATCH] 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. --- .github/workflows/included-images.yml | 1 + CHANGES.md | 2 ++ base/.env | 1 + base/Dockerfile | 5 ++++- base/docker-compose.yml | 1 + base/install_modules.sh | 12 ++++++++++++ base/musl/Dockerfile | 4 ++++ base/musl/docker-compose.yml | 1 + images/docker-compose-mca.yml | 13 +++++++++++++ 9 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 images/docker-compose-mca.yml diff --git a/.github/workflows/included-images.yml b/.github/workflows/included-images.yml index 7d3d762..952d566 100644 --- 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 index 671189f..1d8cfc6 100644 --- 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 * base: add IOCStats module. by @gustavosr8 in https://github.com/cnpem/epics-in-docker/pull/62 * base: add IPMIComm module. by @gustavosr8 in diff --git a/base/.env b/base/.env index 56d0397..88ef91f 100644 --- a/base/.env +++ b/base/.env @@ -21,6 +21,7 @@ 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 diff --git a/base/Dockerfile b/base/Dockerfile index 815c79a..8e9bd61 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -12,13 +12,15 @@ 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 \ libsnmp-dev \ - libssl-dev \ re2c \ unzip \ wget \ @@ -61,6 +63,7 @@ ARG IPMICOMM_VERSION ARG PYDEVSUP_VERSION ARG SNMP_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 index 6f26a60..1b3e065 100644 --- a/base/docker-compose.yml +++ b/base/docker-compose.yml @@ -30,6 +30,7 @@ services: 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} diff --git a/base/install_modules.sh b/base/install_modules.sh index 073a9fc..9372c74 100755 --- a/base/install_modules.sh +++ b/base/install_modules.sh @@ -94,3 +94,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 index f7a4804..e47ecea 100644 --- 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 \ @@ -60,6 +63,7 @@ ARG IPMICOMM_VERSION ARG PYDEVSUP_VERSION ARG SNMP_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 index 15c0485..58bd435 100644 --- a/base/musl/docker-compose.yml +++ b/base/musl/docker-compose.yml @@ -30,3 +30,4 @@ services: PYDEVSUP_VERSION: ${PYDEVSUP_VERSION} SNMP_VERSION: ${SNMP_VERSION} SCALER_VERSION: ${SCALER_VERSION} + MCA_VERSION: ${MCA_VERSION} diff --git a/images/docker-compose-mca.yml b/images/docker-compose-mca.yml new file mode 100644 index 0000000..3ebb5d9 --- /dev/null +++ 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