diff --git a/CHANGES.md b/CHANGES.md index 7e19c33..371156b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,7 +4,8 @@ ### New features -* base: Pmac module version update and add motorPIGCS2 IOC and image. +* base: Pmac module version update, add motorPIGCS2 IOC and + add scaler IOC, and image. by @guirodrigueslima in https://github.com/cnpem/epics-in-docker/pull/64 ## v0.8.0 diff --git a/base/.env b/base/.env index edf26d2..4a0e6a2 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 +SCALER_VERSION=4.1 AREA_DETECTOR_VERSION=R3-12-1 NDSSCPIMEGA_VERSION=1.0.0 diff --git a/base/Dockerfile b/base/Dockerfile index 823e297..122def7 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 SCALER_VERSION COPY caputlog-waveform-fix.patch . COPY install_modules.sh . diff --git a/base/install_modules.sh b/base/install_modules.sh index 0516e5c..306191a 100755 --- a/base/install_modules.sh +++ b/base/install_modules.sh @@ -65,3 +65,8 @@ EPICS_BASE install_from_github -i epics-modules ether_ip ETHER_IP $ETHER_IP_VERSION " EPICS_BASE " + +install_from_github -i epics-modules scaler SCALER $SCALER_VERSION " +EPICS_BASE +ASYN +" diff --git a/base/musl/Dockerfile b/base/musl/Dockerfile index 0adc10f..a3f51f0 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 SCALER_VERSION WORKDIR ${EPICS_MODULES_PATH} COPY caputlog-waveform-fix.patch .