From 41c590c2347be09f06be17375050851e66c238d1 Mon Sep 17 00:00:00 2001 From: Guilherme Rodrigues de Lima Date: Wed, 24 Jul 2024 11:16:27 -0300 Subject: [PATCH] base: add SNMP module --- CHANGES.md | 5 +++++ base/.env | 1 + base/Dockerfile | 2 ++ base/docker-compose.yml | 1 + base/install_modules.sh | 4 ++++ base/musl/Dockerfile | 2 ++ base/musl/docker-compose.yml | 1 + 7 files changed, 16 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index f464da8..12a5a19 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,11 @@ ## Unreleased +### New features + +* base: add SNMP module. by @guirodrigueslima in + https://github.com/cnpem/epics-in-docker/pull/XX + ## v0.8.0 A new container image, `ghcr.io/cnpem/opcua-epics-ioc`, is now available. diff --git a/base/.env b/base/.env index eda31a1..d819b9f 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=R2.5 AREA_DETECTOR_VERSION=R3-12-1 NDSSCPIMEGA_VERSION=1.0.0 diff --git a/base/Dockerfile b/base/Dockerfile index 0eec1f9..0a532cc 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 \ wget \ @@ -57,6 +58,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 c7b55d7..fea8e93 100755 --- a/base/install_modules.sh +++ b/base/install_modules.sh @@ -82,3 +82,7 @@ echo PYTHON=python3 >> pyDevSup/configure/CONFIG_SITE install_module pyDevSup PYDEVSUP " EPICS_BASE " + +install_from_github slac-epics snmp SNMP $SNMP_VERSION " +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}