diff --git a/CHANGES.md b/CHANGES.md index 095d7d1..f4a12c1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,6 +19,8 @@ https://github.com/cnpem/epics-in-docker/pull/67 * This allows to use ZIP files in `RUNTIME_TAR_PACKAGES` and `BUILD_TAR_PACKAGES`. +* base: add SNMP module. by @guirodrigueslima in + https://github.com/cnpem/epics-in-docker/pull/67 ## v0.8.1 diff --git a/base/.env b/base/.env index eda31a1..4df7b35 100644 --- a/base/.env +++ b/base/.env @@ -19,6 +19,7 @@ ETHER_IP_VERSION=ether_ip-3-3 IOCSTATS_VERSION=3.2.0 IPMICOMM_VERSION=R4.6.0 PYDEVSUP_VERSION=1.2 +SNMP_VERSION=1.1.0.4 AREA_DETECTOR_VERSION=R3-12-1 NDSSCPIMEGA_VERSION=1.0.0 diff --git a/base/Dockerfile b/base/Dockerfile index 971b256..179da93 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -17,6 +17,7 @@ RUN apt update -y && \ libtiff-dev \ libusb-1.0-0-dev \ libxml2-dev \ + libsnmp-dev \ libssl-dev \ re2c \ unzip \ @@ -58,6 +59,7 @@ ARG ETHER_IP_VERSION ARG IOCSTATS_VERSION ARG IPMICOMM_VERSION ARG PYDEVSUP_VERSION +ARG SNMP_VERSION COPY ipmicomm.patch . COPY caputlog-waveform-fix.patch . diff --git a/base/docker-compose.yml b/base/docker-compose.yml index b7f258a..c79b805 100644 --- a/base/docker-compose.yml +++ b/base/docker-compose.yml @@ -28,6 +28,7 @@ services: IOCSTATS_VERSION: ${IOCSTATS_VERSION} IPMICOMM_VERSION: ${IPMICOMM_VERSION} PYDEVSUP_VERSION: ${PYDEVSUP_VERSION} + SNMP_VERSION: ${SNMP_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 9a7b222..befb317 100755 --- a/base/install_modules.sh +++ b/base/install_modules.sh @@ -81,3 +81,11 @@ echo PYTHON=python3 >> pyDevSup/configure/CONFIG_SITE install_module pyDevSup PYDEVSUP " EPICS_BASE " + +mkdir snmp +cd snmp +lnls-get-n-unpack -l https://groups.nscl.msu.edu/controls/files/epics-snmp-$SNMP_VERSION.zip +cd .. +install_module -i snmp SNMP " +EPICS_BASE +" diff --git a/base/musl/Dockerfile b/base/musl/Dockerfile index 6abc3aa..34d5b57 100644 --- a/base/musl/Dockerfile +++ b/base/musl/Dockerfile @@ -15,6 +15,7 @@ RUN apk add --no-cache \ make \ musl-dev \ ncurses-terminfo \ + net-snmp-dev \ patch \ perl \ rpcsvc-proto \ @@ -57,6 +58,7 @@ ARG ETHER_IP_VERSION ARG IOCSTATS_VERSION ARG IPMICOMM_VERSION ARG PYDEVSUP_VERSION +ARG SNMP_VERSION WORKDIR ${EPICS_MODULES_PATH} COPY ipmicomm.patch . diff --git a/base/musl/docker-compose.yml b/base/musl/docker-compose.yml index 0afbb41..dc1beba 100644 --- a/base/musl/docker-compose.yml +++ b/base/musl/docker-compose.yml @@ -28,3 +28,4 @@ services: IOCSTATS_VERSION: ${IOCSTATS_VERSION} IPMICOMM_VERSION: ${IPMICOMM_VERSION} PYDEVSUP_VERSION: ${PYDEVSUP_VERSION} + SNMP_VERSION: ${SNMP_VERSION}