Merge pull request #62 from lnls-sirius/add-new-dep

Fix bugs and update as-ti-general service
lnls-sirius · Dec 5, 2023 · ba05625 · ba05625
2 parents 3d9dc9c + a9b28c2
commit ba05625
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 48 deletions.
diff --git a/apps/as-ti-general.bash b/apps/as-ti-general.bash
@@ -22,6 +22,9 @@ export PYTHONUNBUFFERED=yes
 # sirius-ioc-si-ti-trig.service
 /usr/local/bin/sirius-ioc-as-ti-control.py -s si >& /ioc-logs/sirius-ioc-si-ti-trig & # 5.9%
 
+# sirius-ioc-ba-ti-trig.service
+/usr/local/bin/sirius-ioc-as-ti-control.py -s ba >& /ioc-logs/sirius-ioc-ba-ti-trig & # 5.9%
+
 # run cron for log rotation
 cron &
 

diff --git a/apps/si-id-epu50.bash b/apps/si-id-epu50.bash
diff --git a/dockerfile-templates/Dockerfile.deps b/dockerfile-templates/Dockerfile.deps
@@ -25,13 +25,14 @@ COPY ./etc/logrotate.conf /etc/logrotate.conf
 # Install pip-package dependencies
 
 RUN pip-sirius install \
-    aiohttp \
-    bottleneck \
+    aiohttp:pkg_version_aiohttp \
+    bottleneck:pkg_version_bottleneck \
     python-dateutil \
     urllib3 \
-    scipy \
+    scipy:pkg_version_scipy \
     pydantic \
     pyyaml \
     serial \
     toml \
-    GPy:pkg_version_gpy
+    GPy:pkg_version_gpy \
+    h5py:pkg_version_h5py
diff --git a/dockerfile-templates/Dockerfile.python b/dockerfile-templates/Dockerfile.python
@@ -48,8 +48,8 @@ RUN ln -s /usr/bin/python3 /usr/local/bin/python-sirius && \
 # Install basic python pip packages
 
 RUN pip-sirius install \
-    numpy \
-    matplotlib
+    numpy:pkg_version_numpy\
+    matplotlib:pkg_version_matplotlib
 
 # update pip version
 

diff --git a/pkg-versions.txt b/pkg-versions.txt
@@ -2,6 +2,12 @@ pkg_version_pip ==21.3.1
 pkg_version_pyepics ==3.4.0
 pkg_version_pcaspy ==0.7.3
 pkg_version_gpy ==1.10.0
+pkg_version_h5py ==3.10.0
+pkg_version_numpy ==1.20.3
+pkg_version_bottleneck ==1.3.2
+pkg_version_aiohttp ==3.7.4
+pkg_version_matplotlib ==3.3.4
+pkg_version_scipy ==1.10.1
 
 pkg_version_python2_pip ==9.0.1
 pkg_version_python2_pyepics ==3.4.0

diff --git a/services/docker-stack-si-ap-idff-delta52.yml b/services/docker-stack-si-ap-idff-delta52.yml
@@ -0,0 +1,28 @@
+version: "3.7"
+
+services:
+
+  iocs:
+    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
+    command: bash -c '/ioc-apps/si-ap-idff-delta52.bash'
+    volumes:
+      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == IA-18RaDiag04-CO-IOCSrv
+      replicas: 1
+      restart_policy:
+        condition: any
+    logging:
+      driver: "json-file"
+      options:
+        max-file: "10"
+        max-size: "10m"
+    networks:
+      - ioc-network
+
+networks:
+  ioc-network:
+    external: true
+    name: "host"
diff --git a/services/docker-stack-si-id.yml b/services/docker-stack-si-id.yml
@@ -2,30 +2,8 @@ version: "3.7"
 
 services:
 
-  epu50:
-    image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
-    command: bash -c '/ioc-apps/si-id-epu50.bash'
-    volumes:
-      - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"
-    deploy:
-      placement:
-        constraints:
-          - node.hostname == IA-18RaDiag04-CO-IOCSrv
-      replicas: 1
-      restart_policy:
-        condition: any
-    logging:
-      driver: "json-file"
-      options:
-        max-file: "10"
-        max-size: "10m"
-    networks:
-      - ioc-network
-
   conv:
     image: dockerregistry.lnls-sirius.com.br/fac/fac-iocs:__FAC_IOC_TAG_TEMPLATE__
-    depends_on:
-      - "epu50"
     command: bash -c '/ioc-apps/si-id-conv.bash'
     volumes:
       - "/storage/common/fac/iocs-log:/home/sirius/iocs-log"

diff --git a/tags.mk b/tags.mk
@@ -10,11 +10,11 @@ EPICS_BASE_TAG ?= base-3.15.6
 
 # tags used for creating docker images
 IMG_DEBIAN_TAG ?= bullseye-20211011
-DEPLOY_TAG ?= 2023-02-10
+DEPLOY_TAG ?= 2023-11-11
 
 # image tags used for starting docker services
 IMG_IOCS_LI_PS_TAG ?= 2022-12-03
-IMG_PYTHON_TAG ?= 2022-12-03 # also used as base image for fac-epics
-IMG_EPICS_TAG ?= 2022-12-03
-IMG_DEPS_TAG ?= 2023-02-10
+IMG_PYTHON_TAG ?= 2023-11-11 # also used as base image for fac-epics
+IMG_EPICS_TAG ?= 2023-11-11
+IMG_DEPS_TAG ?= 2023-11-11
 IMG_IOCS_TAG ?= $(DEPLOY_TAG)
diff --git a/tools/generate_service_files.py b/tools/generate_service_files.py
@@ -82,7 +82,6 @@ class ServiceConfig:
         'si-ap-fofb': 'IA-18RaDiag04-CO-IOCSrv',
         'si-ap-stabinfo': 'IA-20RaDiag02-CO-IOCSrv-2',
         'si-id-conv': 'IA-18RaDiag04-CO-IOCSrv',
-        'si-id-delta52': 'IA-18RaDiag04-CO-IOCSrv',
         'si-ap-sofb': 'IA-20RaDiag01-CO-IOCSrv-2',
         'si-ps-dips': 'IA-14RaDiag03-CO-IOCSrv',
         'si-ps-quads-qfq': 'IA-16RaBbB-CO-IOCSrv',