Skip to content

Commit

Permalink
base: add ether_ip IOC and module.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
guirodrigueslima authored and ericonr committed Apr 24, 2024
1 parent e2c7f12 commit 030afce
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## Unreleased

### New features

* base: add OPCUA and `ether_ip` IOCs and modules. 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,
Expand Down
3 changes: 3 additions & 0 deletions base/.env
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@ 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
LIBSSCPIMEGA_VERSION=fb8acf533a7c01b5266bf32d60d1a5f923e19523

MOTOR_VERSION=R7-3-1
PMAC_VERSION=2-6-1

OPCUA_VERSION=0.9.4
8 changes: 8 additions & 0 deletions base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ RUN apt update -y && \
libtiff-dev \
libusb-1.0-0-dev \
libxml2-dev \
libssl-dev \
re2c \
wget \
ca-certificates
Expand Down Expand Up @@ -50,6 +51,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 .
Expand All @@ -68,3 +70,9 @@ ARG PMAC_VERSION

COPY install_motor.sh .
RUN ./install_motor.sh

ARG DEBIAN_VERSION
ARG OPCUA_VERSION

COPY install_opcua.sh .
RUN ./install_opcua.sh
2 changes: 2 additions & 0 deletions base/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ 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}
MOTOR_VERSION: ${MOTOR_VERSION}
PMAC_VERSION: ${PMAC_VERSION}
OPCUA_VERSION: ${OPCUA_VERSION}
4 changes: 4 additions & 0 deletions base/install_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
"
17 changes: 17 additions & 0 deletions base/install_opcua.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env bash

set -ex

. /opt/epics/install-functions.sh

opcua_release_url=https://github.com/epics-modules/opcua/releases/download/v${OPCUA_VERSION}
opcua_release_file=IOC_opcua-${OPCUA_VERSION}_Base-${EPICS_BASE_VERSION}_debian${DEBIAN_VERSION%.*}.tar.gz
lnls-get-n-unpack -l $opcua_release_url/$opcua_release_file

mv binaryOpcuaIoc opcua
install_module -i opcua OPCUA "
EPICS_BASE
"

EPICS_HOST_ARCH=`perl ${EPICS_BASE_PATH}/lib/perl/EpicsHostArch.pl`
ln -s ${EPICS_MODULES_PATH}/opcua/{opcuaIocApp/libopcua.so.0.9,lib/${EPICS_HOST_ARCH}/libopcua.so}
1 change: 1 addition & 0 deletions base/musl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
1 change: 1 addition & 0 deletions base/musl/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ services:
IPAC_VERSION: ${IPAC_VERSION}
CAPUTLOG_VERSION: ${CAPUTLOG_VERSION}
RETOOLS_VERSION: ${RETOOLS_VERSION}
ETHER_IP_VERSION: ${ETHER_IP_VERSION}

0 comments on commit 030afce

Please sign in to comment.