Skip to content

Commit

Permalink
base: Add MCA IOC
Browse files Browse the repository at this point in the history
    - The MCA IOC  was added to module, it was necessary to install IOC Scaler
      and the libnet and libpcap libraries.
    - It was observed that some IOC need to instance
      their own directory in the RELEASE file, for this reason the "dependency_name"
      is being added before get_module_path in the install_module() function.
    - The IOC was built and created the docker-compose-mca.yml file to generate new container image.
  • Loading branch information
guirodrigueslima committed May 20, 2024
1 parent 156ac68 commit 43d40ec
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/included-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ jobs:
uses: docker/bake-action@v4
with:
workdir: images/
files: docker-compose-opcua.yml docker-compose-motorpigcs2.yml
files: docker-compose-opcua.yml docker-compose-motorpigcs2.yml docker-compose-mca.yml
push: true
3 changes: 2 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

## Unreleased

* base: Pmac module version update and Add motorPIGCS2 IOC. by @guirodrigueslima
* base: Pmac module version update, add motorPIGCS2 and MCA IOC. by @guirodrigueslima in
https://github.com/cnpem/epics-in-docker/pull/64

## v0.8.0

Expand Down
2 changes: 2 additions & 0 deletions base/.env
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ IPAC_VERSION=2.16
CAPUTLOG_VERSION=R4.0
RETOOLS_VERSION=b7abe82533cdbd7ddbc2dc845c95a2c51b7f2db9
ETHER_IP_VERSION=ether_ip-3-3
SCALER_VERSION=4.1
MCA_VERSION=R7-10

AREA_DETECTOR_VERSION=R3-12-1
NDSSCPIMEGA_VERSION=1.0.0
Expand Down
4 changes: 4 additions & 0 deletions base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ RUN apt update -y && \
libusb-1.0-0-dev \
libxml2-dev \
libssl-dev \
libnet-dev \
libpcap-dev \
re2c \
wget \
ca-certificates
Expand Down Expand Up @@ -52,6 +54,8 @@ ARG IPAC_VERSION
ARG CAPUTLOG_VERSION
ARG RETOOLS_VERSION
ARG ETHER_IP_VERSION
ARG SCALER_VERSION
ARG MCA_VERSION

COPY caputlog-waveform-fix.patch .
COPY install_modules.sh .
Expand Down
3 changes: 3 additions & 0 deletions base/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,8 @@ services:
NDSSCPIMEGA_VERSION: ${NDSSCPIMEGA_VERSION}
LIBSSCPIMEGA_VERSION: ${LIBSSCPIMEGA_VERSION}
MOTOR_VERSION: ${MOTOR_VERSION}
PIGCS2_VERSION: ${PIGCS2_VERSION}
PMAC_VERSION: ${PMAC_VERSION}
OPCUA_VERSION: ${OPCUA_VERSION}
SCALER_VERSION: ${SCALER_VERSION}
MCA_VERSION: ${MCA_VERSION}
5 changes: 3 additions & 2 deletions base/install-functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ install_module() {
release_modules="$3"

cd $module_name

echo ${dependency_name}=${PWD} >> ${EPICS_RELEASE_FILE}

get_module_path "$release_modules" > configure/RELEASE

if [ -n "$NEEDS_TIRPC" ]; then
Expand All @@ -40,8 +43,6 @@ install_module() {
make -C iocBoot
fi

echo ${dependency_name}=${PWD} >> ${EPICS_RELEASE_FILE}

cd -
}

Expand Down
17 changes: 17 additions & 0 deletions base/install_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,20 @@ EPICS_BASE
install_from_github -i epics-modules ether_ip ETHER_IP $ETHER_IP_VERSION "
EPICS_BASE
"

install_from_github -i epics-modules scaler SCALER $SCALER_VERSION "
EPICS_BASE
ASYN
"

install_from_github -i epics-modules mca MCA $MCA_VERSION "
EPICS_BASE
CALC
SSCAN
BUSY
SCALER
SNCSEQ
AUTOSAVE
ASYN
MCA
"
7 changes: 6 additions & 1 deletion base/musl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ RUN apk add --no-cache \
meson \
re2c \
readline-dev \
readline-static
readline-static \
libnet-dev \
libpcap-dev \
libusb-dev

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 @@ -52,6 +55,8 @@ ARG IPAC_VERSION
ARG CAPUTLOG_VERSION
ARG RETOOLS_VERSION
ARG ETHER_IP_VERSION
ARG SCALER_VERSION
ARG MCA_VERSION

WORKDIR ${EPICS_MODULES_PATH}
COPY caputlog-waveform-fix.patch .
Expand Down
2 changes: 2 additions & 0 deletions base/musl/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ services:
CAPUTLOG_VERSION: ${CAPUTLOG_VERSION}
RETOOLS_VERSION: ${RETOOLS_VERSION}
ETHER_IP_VERSION: ${ETHER_IP_VERSION}
SCALER_VERSION: ${SCALER_VERSION}
MCA_VERSION: ${MCA_VERSION}
13 changes: 13 additions & 0 deletions images/docker-compose-mca.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
services:
ioc:
image: ghcr.io/cnpem/mca-epics-ioc:$TAG
build:
context: ./
dockerfile: ../Dockerfile
target: no-build
labels:
org.opencontainers.image.source: https://github.com/cnpem/epics-in-docker
args:
REPONAME: mca
RUNDIR: /opt/epics/modules/mca/iocBoot/iocAmptek
RUNTIME_PACKAGES: libusb-1.0-0

0 comments on commit 43d40ec

Please sign in to comment.