Skip to content

Commit

Permalink
base: Add motorPIGCS2 IOC and module
Browse files Browse the repository at this point in the history
- The motorPIGCS2 module was added to motor and the commit version was locked,
  this was necessary because the motor submodule is not updated.
- The IOC was built and created the docker-compose-motorpigcs2.yml file to generate new container image.
  • Loading branch information
guirodrigueslima committed May 16, 2024
1 parent 28ad903 commit 156ac68
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 3 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
files: docker-compose-opcua.yml docker-compose-motorpigcs2.yml
push: true
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Unreleased

* base: Pmac module version update. by @guirodrigueslima
* base: Pmac module version update and Add motorPIGCS2 IOC. by @guirodrigueslima

## v0.8.0

Expand Down
1 change: 1 addition & 0 deletions base/.env
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ NDSSCPIMEGA_VERSION=1.0.0
LIBSSCPIMEGA_VERSION=fb8acf533a7c01b5266bf32d60d1a5f923e19523

MOTOR_VERSION=R7-3-1
PIGCS2_VERSION=60af8bdb17c1717e4545d8170f820e358ce31458
PMAC_VERSION=2-6-4b3

OPCUA_VERSION=0.9.4
1 change: 1 addition & 0 deletions base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ COPY install_area_detector.sh .
RUN ./install_area_detector.sh

ARG MOTOR_VERSION
ARG PIGCS2_VERSION
ARG PMAC_VERSION

COPY install_motor.sh .
Expand Down
13 changes: 12 additions & 1 deletion base/install_motor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ git clone --depth 1 --branch ${MOTOR_VERSION} \
cd motor/modules

git submodule update --init --depth 1 -j ${JOBS} \
motorMotorSim
motorMotorSim \
motorPIGCS2

git -C motorPIGCS2 checkout ${PIGCS2_VERSION}

module_releases="
MOTOR=${EPICS_MODULES_PATH}/motor
MOTOR_MOTORSIM=${EPICS_MODULES_PATH}/motor/modules/motorMotorSim
MOTOR_PIGCS2=${EPICS_MODULES_PATH}/motor/modules/motorPIGCS2
"
echo "$module_releases" >> ${EPICS_RELEASE_FILE}

Expand All @@ -37,6 +41,13 @@ cd ..
make -j${JOBS}
make clean

install_module -i modules/motorPIGCS2/iocs/pigcs2IOC PIGCS2 "
EPICS_BASE
ASYN
MOTOR
SNCSEQ
"

cd $EPICS_MODULES_PATH

download_from_github dls-controls pmac $PMAC_VERSION
Expand Down
13 changes: 13 additions & 0 deletions images/docker-compose-motorpigcs2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
services:
ioc:
image: ghcr.io/cnpem/motorpigcs2-epics-ioc:$TAG
build:
context: ./
dockerfile: ../Dockerfile
target: no-build
labels:
org.opencontainers.image.source: https://github.com/cnpem/epics-in-docker
args:
REPONAME: motorpigcs2
RUNDIR: /opt/epics/modules/motor/modules/motorPIGCS2/iocs/pigcs2IOC/iocBoot/iocPIGCS2
RUNTIME_PACKAGES:

0 comments on commit 156ac68

Please sign in to comment.