base: add ether_ip IOC and module.

The module was installed in the modules directory, because there can be other IOCs that depend on the ether_ip module, even though it ships an IOC of its own.
cnpem · Apr 24, 2024 · 7c9a18a · 7c9a18a
1 parent e2c7f12
commit 7c9a18a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+### New features
+
+* base: add `ether_ip` IOC and module. by @guirodrigueslima in
+  https://github.com/cnpem/epics-in-docker/pull/57
+
 ## v0.7.0
 
 Users of the `autosave` and `caPutLog` modules should update to this release,

diff --git a/base/.env b/base/.env
@@ -15,6 +15,7 @@ RECCASTER_VERSION=1.5
 IPAC_VERSION=2.16
 CAPUTLOG_VERSION=R4.0
 RETOOLS_VERSION=b7abe82533cdbd7ddbc2dc845c95a2c51b7f2db9
+ETHER_IP_VERSION=ether_ip-3-3
 
 AREA_DETECTOR_VERSION=R3-12-1
 NDSSCPIMEGA_VERSION=1.0.0

diff --git a/base/Dockerfile b/base/Dockerfile
@@ -50,6 +50,7 @@ ARG RECCASTER_VERSION
 ARG IPAC_VERSION
 ARG CAPUTLOG_VERSION
 ARG RETOOLS_VERSION
+ARG ETHER_IP_VERSION
 
 COPY caputlog-waveform-fix.patch .
 COPY install_modules.sh .

diff --git a/base/docker-compose.yml b/base/docker-compose.yml
@@ -24,6 +24,7 @@ services:
         IPAC_VERSION: ${IPAC_VERSION}
         CAPUTLOG_VERSION: ${CAPUTLOG_VERSION}
         RETOOLS_VERSION: ${RETOOLS_VERSION}
+        ETHER_IP_VERSION: ${ETHER_IP_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
@@ -61,3 +61,7 @@ EPICS_BASE
 install_from_github brunoseivam retools RETOOLS $RETOOLS_VERSION "
 EPICS_BASE
 "
+
+install_from_github -i epics-modules ether_ip ETHER_IP $ETHER_IP_VERSION "
+EPICS_BASE
+"
diff --git a/base/musl/Dockerfile b/base/musl/Dockerfile
@@ -51,6 +51,7 @@ ARG RECCASTER_VERSION
 ARG IPAC_VERSION
 ARG CAPUTLOG_VERSION
 ARG RETOOLS_VERSION
+ARG ETHER_IP_VERSION
 
 WORKDIR ${EPICS_MODULES_PATH}
 COPY caputlog-waveform-fix.patch .

diff --git a/base/musl/docker-compose.yml b/base/musl/docker-compose.yml
@@ -24,3 +24,4 @@ services:
         IPAC_VERSION: ${IPAC_VERSION}
         CAPUTLOG_VERSION: ${CAPUTLOG_VERSION}
         RETOOLS_VERSION: ${RETOOLS_VERSION}
+        ETHER_IP_VERSION: ${ETHER_IP_VERSION}