base: update epics-base to 7.0.8.1.

This also made it necessary to update the OPCUA module, so we could keep
using the prebuilt version.

Since the OPCUA installation scheme was improved, manually adding the
libopcua symlink is no longer necessary. Furthermore, in order to keep
the image compatible with the OPCUA IOC image build, and with st.cmd
files from users of the image, the IOC was installed to 'opcua', and the
library to 'opcua-module'; this is transparent to users, thanks to the
RELEASE file.

Author: ericonr

CHANGES.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+### New features
+
+* base: update to EPICS 7.0.8.1 and OPCUA 0.10.0. by @ericonr in
+  https://github.com/cnpem/epics-in-docker/pull/85
+
 ## v0.12.0
 
 ### New features

base/Dockerfile

@@ -46,7 +46,7 @@ ENV EPICS_RELEASE_FILE $EPICS_IN_DOCKER/RELEASE
 
 WORKDIR /opt/epics
 
-COPY backport-epics-base-musl.patch epics-base-static-linking.patch $EPICS_IN_DOCKER
+COPY epics-base-static-linking.patch $EPICS_IN_DOCKER
 COPY epics_versions.sh install_epics.sh $EPICS_IN_DOCKER
 RUN $EPICS_IN_DOCKER/install_epics.sh
 

base/backport-epics-base-musl.patch

@@ -1 +1 @@
-EPICS_BASE_VERSION=7.0.7
+EPICS_BASE_VERSION=7.0.8.1

base/epics_versions.sh

@@ -8,7 +8,6 @@ set -ex
 lnls-get-n-unpack -l https://epics-controls.org/download/base/base-${EPICS_BASE_VERSION}.tar.gz
 mv base-${EPICS_BASE_VERSION} ${EPICS_BASE_PATH}
 
-patch -d ${EPICS_BASE_PATH} -Np1 < $EPICS_IN_DOCKER/backport-epics-base-musl.patch
 patch -d ${EPICS_BASE_PATH} -Np1 < $EPICS_IN_DOCKER/epics-base-static-linking.patch
 
 if [ -n "$COMMANDLINE_LIBRARY" ]; then

base/install_epics.sh

@@ -7,13 +7,17 @@ set -ex
 . $EPICS_IN_DOCKER/opcua_versions.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
+opcua_release_file=BDIST_opcua-${OPCUA_VERSION}_Base-${EPICS_BASE_VERSION}_debian${DEBIAN_VERSION%.*}.tar.gz
 lnls-get-n-unpack -l $opcua_release_url/$opcua_release_file
+rm HOW_TO.md
 
-mv binaryOpcuaIoc opcua
-install_module -i opcua OPCUA "
+mv opcuaBinaryDist opcua-module
+install_module opcua-module 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}
+mv opcuaExampleIoc opcua
+install_module -i opcua OPCUA_IOC "
+EPICS_BASE
+OPCUA
+"

base/install_opcua.sh

@@ -47,7 +47,7 @@ ENV EPICS_RELEASE_FILE $EPICS_IN_DOCKER/RELEASE
 
 WORKDIR /opt/epics
 
-COPY backport-epics-base-musl.patch epics-base-static-linking.patch $EPICS_IN_DOCKER
+COPY epics-base-static-linking.patch $EPICS_IN_DOCKER
 COPY epics_versions.sh install_epics.sh $EPICS_IN_DOCKER
 RUN COMMANDLINE_LIBRARY=READLINE_NCURSES $EPICS_IN_DOCKER/install_epics.sh
 

base/musl/Dockerfile

@@ -1 +1 @@
-OPCUA_VERSION=0.9.4
+OPCUA_VERSION=0.10.0