diff --git a/CHANGES.md b/CHANGES.md index 77ec6c4..f464da8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,8 @@ A new container image, `ghcr.io/cnpem/opcua-epics-ioc`, is now available. https://github.com/cnpem/epics-in-docker/pull/62 * base: add IPMIComm module. by @gustavosr8 in https://github.com/cnpem/epics-in-docker/pull/62 +* base: add pyDevSup module. by @gustavosr8 in + https://github.com/cnpem/epics-in-docker/pull/62 ## v0.7.0 diff --git a/base/.env b/base/.env index 71b51f8..eda31a1 100644 --- a/base/.env +++ b/base/.env @@ -18,6 +18,7 @@ RETOOLS_VERSION=b7abe82533cdbd7ddbc2dc845c95a2c51b7f2db9 ETHER_IP_VERSION=ether_ip-3-3 IOCSTATS_VERSION=3.2.0 IPMICOMM_VERSION=R4.6.0 +PYDEVSUP_VERSION=1.2 AREA_DETECTOR_VERSION=R3-12-1 NDSSCPIMEGA_VERSION=1.0.0 diff --git a/base/Dockerfile b/base/Dockerfile index 18ee289..0eec1f9 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -20,6 +20,8 @@ RUN apt update -y && \ libssl-dev \ re2c \ wget \ + python3-dev \ + python3-numpy \ ca-certificates COPY lnls-get-n-unpack.sh /usr/local/bin/lnls-get-n-unpack @@ -54,6 +56,7 @@ ARG RETOOLS_VERSION ARG ETHER_IP_VERSION ARG IOCSTATS_VERSION ARG IPMICOMM_VERSION +ARG PYDEVSUP_VERSION COPY ipmicomm.patch . COPY caputlog-waveform-fix.patch . diff --git a/base/docker-compose.yml b/base/docker-compose.yml index 871e262..b7f258a 100644 --- a/base/docker-compose.yml +++ b/base/docker-compose.yml @@ -27,6 +27,7 @@ services: ETHER_IP_VERSION: ${ETHER_IP_VERSION} IOCSTATS_VERSION: ${IOCSTATS_VERSION} IPMICOMM_VERSION: ${IPMICOMM_VERSION} + PYDEVSUP_VERSION: ${PYDEVSUP_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 714bbc6..c7b55d7 100755 --- a/base/install_modules.sh +++ b/base/install_modules.sh @@ -76,3 +76,9 @@ install_module ipmiComm IPMICOMM " EPICS_BASE ASYN " + +download_from_github mdavidsaver pyDevSup $PYDEVSUP_VERSION +echo PYTHON=python3 >> pyDevSup/configure/CONFIG_SITE +install_module pyDevSup PYDEVSUP " +EPICS_BASE +" diff --git a/base/musl/Dockerfile b/base/musl/Dockerfile index 6396fc1..8b9f589 100644 --- a/base/musl/Dockerfile +++ b/base/musl/Dockerfile @@ -22,7 +22,9 @@ RUN apk add --no-cache \ meson \ re2c \ readline-dev \ - readline-static + readline-static \ + python3-dev \ + py3-numpy@community COPY lnls-get-n-unpack.sh /usr/local/bin/lnls-get-n-unpack COPY lnls-run.sh /usr/local/bin/lnls-run @@ -54,6 +56,7 @@ ARG RETOOLS_VERSION ARG ETHER_IP_VERSION ARG IOCSTATS_VERSION ARG IPMICOMM_VERSION +ARG PYDEVSUP_VERSION WORKDIR ${EPICS_MODULES_PATH} COPY ipmicomm.patch . diff --git a/base/musl/docker-compose.yml b/base/musl/docker-compose.yml index a802547..0afbb41 100644 --- a/base/musl/docker-compose.yml +++ b/base/musl/docker-compose.yml @@ -27,3 +27,4 @@ services: ETHER_IP_VERSION: ${ETHER_IP_VERSION} IOCSTATS_VERSION: ${IOCSTATS_VERSION} IPMICOMM_VERSION: ${IPMICOMM_VERSION} + PYDEVSUP_VERSION: ${PYDEVSUP_VERSION}