Skip to content

Commit

Permalink
base: add pyDevSup module.
Browse files Browse the repository at this point in the history
  • Loading branch information
gustavosr8 committed Jun 26, 2024
1 parent 53f5944 commit ed5fd1f
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions base/.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 .
Expand Down
1 change: 1 addition & 0 deletions base/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
6 changes: 6 additions & 0 deletions base/install_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
"
5 changes: 4 additions & 1 deletion base/musl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 .
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 @@ -27,3 +27,4 @@ services:
ETHER_IP_VERSION: ${ETHER_IP_VERSION}
IOCSTATS_VERSION: ${IOCSTATS_VERSION}
IPMICOMM_VERSION: ${IPMICOMM_VERSION}
PYDEVSUP_VERSION: ${PYDEVSUP_VERSION}

0 comments on commit ed5fd1f

Please sign in to comment.