diff --git a/CHANGES.md b/CHANGES.md index bc334ea..cfa3ca0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,8 @@ * 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 ## v0.8.0 diff --git a/base/.env b/base/.env index 2c8d155..4164649 100644 --- a/base/.env +++ b/base/.env @@ -18,6 +18,7 @@ RETOOLS_VERSION=b7abe82533cdbd7ddbc2dc845c95a2c51b7f2db9 ETHER_IP_VERSION=ether_ip-3-3 IOCSTATS_VERSION=3.2.0 IPMICOMM_VERSION=R4.6.0 +SCALER_VERSION=4.1 AREA_DETECTOR_VERSION=R3-12-1 NDSSCPIMEGA_VERSION=1.0.0 diff --git a/base/Dockerfile b/base/Dockerfile index 29c0110..be66eb1 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -54,6 +54,7 @@ ARG RETOOLS_VERSION ARG ETHER_IP_VERSION ARG IOCSTATS_VERSION ARG IPMICOMM_VERSION +ARG SCALER_VERSION COPY ipmicomm.patch . COPY caputlog-waveform-fix.patch . diff --git a/base/docker-compose.yml b/base/docker-compose.yml index 68ec302..25a220d 100644 --- a/base/docker-compose.yml +++ b/base/docker-compose.yml @@ -34,3 +34,4 @@ services: PIGCS2_VERSION: ${PIGCS2_VERSION} PMAC_VERSION: ${PMAC_VERSION} OPCUA_VERSION: ${OPCUA_VERSION} + SCALER_VERSION : ${SCALER_VERSION} diff --git a/base/install_modules.sh b/base/install_modules.sh index 714bbc6..c3eb529 100755 --- a/base/install_modules.sh +++ b/base/install_modules.sh @@ -76,3 +76,8 @@ install_module ipmiComm IPMICOMM " EPICS_BASE ASYN " + +install_from_github epics-modules scaler SCALER $SCALER_VERSION " +EPICS_BASE +ASYN +" diff --git a/base/musl/Dockerfile b/base/musl/Dockerfile index 6396fc1..4c70223 100644 --- a/base/musl/Dockerfile +++ b/base/musl/Dockerfile @@ -54,6 +54,7 @@ ARG RETOOLS_VERSION ARG ETHER_IP_VERSION ARG IOCSTATS_VERSION ARG IPMICOMM_VERSION +ARG SCALER_VERSION WORKDIR ${EPICS_MODULES_PATH} COPY ipmicomm.patch . diff --git a/base/musl/docker-compose.yml b/base/musl/docker-compose.yml index a802547..e67c677 100644 --- a/base/musl/docker-compose.yml +++ b/base/musl/docker-compose.yml @@ -27,3 +27,4 @@ services: ETHER_IP_VERSION: ${ETHER_IP_VERSION} IOCSTATS_VERSION: ${IOCSTATS_VERSION} IPMICOMM_VERSION: ${IPMICOMM_VERSION} + SCALER_VERSION : ${SCALER_VERSION}