From fa4c76fc3684805a462b9f19cb43f6dfaeb6ed7c Mon Sep 17 00:00:00 2001 From: Gustavo de Souza dos Reis Date: Mon, 6 May 2024 13:42:11 -0300 Subject: [PATCH] base: add iocStats module. --- CHANGES.md | 2 ++ base/.env | 1 + base/Dockerfile | 1 + base/docker-compose.yml | 1 + base/install_modules.sh | 4 ++++ base/musl/Dockerfile | 1 + base/musl/docker-compose.yml | 1 + 7 files changed, 11 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 2cd3427..2f18f42 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,8 @@ A new container image, `ghcr.io/cnpem/opcua-epics-ioc`, is now available. https://github.com/cnpem/epics-in-docker/pull/57 * images: add OPCUA image. by @ericonr in https://github.com/cnpem/epics-in-docker/pull/61 +* base: add IOCStats module. by @gustavosr8 in + https://github.com/cnpem/epics-in-docker/pull/62 ## v0.7.0 diff --git a/base/.env b/base/.env index d1de4d0..ab9e8a9 100644 --- a/base/.env +++ b/base/.env @@ -16,6 +16,7 @@ IPAC_VERSION=2.16 CAPUTLOG_VERSION=R4.0 RETOOLS_VERSION=b7abe82533cdbd7ddbc2dc845c95a2c51b7f2db9 ETHER_IP_VERSION=ether_ip-3-3 +IOCSTATS_VERSION=3.2.0 AREA_DETECTOR_VERSION=R3-12-1 NDSSCPIMEGA_VERSION=1.0.0 diff --git a/base/Dockerfile b/base/Dockerfile index 4a22930..1939f90 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -52,6 +52,7 @@ ARG IPAC_VERSION ARG CAPUTLOG_VERSION ARG RETOOLS_VERSION ARG ETHER_IP_VERSION +ARG IOCSTATS_VERSION COPY caputlog-waveform-fix.patch . COPY install_modules.sh . diff --git a/base/docker-compose.yml b/base/docker-compose.yml index a1a0d01..3066828 100644 --- a/base/docker-compose.yml +++ b/base/docker-compose.yml @@ -25,6 +25,7 @@ services: CAPUTLOG_VERSION: ${CAPUTLOG_VERSION} RETOOLS_VERSION: ${RETOOLS_VERSION} ETHER_IP_VERSION: ${ETHER_IP_VERSION} + IOCSTATS_VERSION: ${IOCSTATS_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 0516e5c..48bd3ee 100755 --- a/base/install_modules.sh +++ b/base/install_modules.sh @@ -65,3 +65,7 @@ EPICS_BASE install_from_github -i epics-modules ether_ip ETHER_IP $ETHER_IP_VERSION " EPICS_BASE " + +install_from_github epics-modules iocStats DEVIOCSTATS $IOCSTATS_VERSION " +EPICS_BASE +" diff --git a/base/musl/Dockerfile b/base/musl/Dockerfile index 0adc10f..683d2f6 100644 --- a/base/musl/Dockerfile +++ b/base/musl/Dockerfile @@ -52,6 +52,7 @@ ARG IPAC_VERSION ARG CAPUTLOG_VERSION ARG RETOOLS_VERSION ARG ETHER_IP_VERSION +ARG IOCSTATS_VERSION WORKDIR ${EPICS_MODULES_PATH} COPY caputlog-waveform-fix.patch . diff --git a/base/musl/docker-compose.yml b/base/musl/docker-compose.yml index e21d3ba..87a2d42 100644 --- a/base/musl/docker-compose.yml +++ b/base/musl/docker-compose.yml @@ -25,3 +25,4 @@ services: CAPUTLOG_VERSION: ${CAPUTLOG_VERSION} RETOOLS_VERSION: ${RETOOLS_VERSION} ETHER_IP_VERSION: ${ETHER_IP_VERSION} + IOCSTATS_VERSION: ${IOCSTATS_VERSION}