From 7ecdac7fd4a921d05daa5dc58f278511c01e9a58 Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Fri, 5 Nov 2021 15:53:27 +0100
Subject: [PATCH] L2SS-398: code cleanup
---
docker-compose/archiver.yml | 2 +-
docker/tango/tango-archiver/Dockerfile | 27 -------------------
.../tango-archiver/data/archiver-devices.json | 4 +--
3 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/docker-compose/archiver.yml b/docker-compose/archiver.yml
index cc849607f..a4f551360 100644
--- a/docker-compose/archiver.yml
+++ b/docker-compose/archiver.yml
@@ -54,7 +54,7 @@ services:
/bin/bash -c "
wait-for-it.sh archiver-maria-db:3306 --timeout=30 --strict --
wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --
- hdbppes-srv 02"
+ hdbppes-srv 03"
restart: unless-stopped
hdbpp-cm:
diff --git a/docker/tango/tango-archiver/Dockerfile b/docker/tango/tango-archiver/Dockerfile
index 4d1dc9306..1a71c9a49 100644
--- a/docker/tango/tango-archiver/Dockerfile
+++ b/docker/tango/tango-archiver/Dockerfile
@@ -104,32 +104,6 @@ RUN cd hdbpp-es \
--requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
make install
-RUN git clone -b v1.0.1 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-es.git
-
-RUN cd hdbpp-es2 \
- && make TANGO_INC=/usr/local/include/tango
-
-RUN cd hdbpp-es2 \
- && checkinstall \
- --install=yes \
- --fstrans=no \
- --showinstall=no \
- --backup=no \
- --type=debian \
- --pkgsource="https://github.com/tango-controls-hdbpp/hdbpp-es" \
- --pkglicense="GPLv3" \
- --deldesc=no \
- --nodoc \
- --strip \
- --stripso \
- --maintainer="tango" \
- --pkgarch=$(dpkg --print-architecture) \
- --pkgversion="1.0.1" \
- --pkgrelease="SNAPSHOT" \
- --pkgname="hdbpp-es" \
- --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
- make install
-
RUN git clone -b v1.0.0 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-cm.git
RUN cd hdbpp-cm \
@@ -165,7 +139,6 @@ RUN apt-get update && \
RUN dpkg -i /libhdbpp/build/libhdbpp_1.0.0-SNAPSHOT_amd64.deb
RUN dpkg -i /libhdbpp-mysql/libhdbpp-mysql_1.1.0-SNAPSHOT_amd64.deb
RUN dpkg -i /hdbpp-es/hdbpp-es_1.0.1-SNAPSHOT_amd64.deb
-RUN dpkg -i /hdbpp-es2/hdbpp-es_1.0.1-SNAPSHOT_amd64.deb
RUN dpkg -i /hdbpp-cm/hdbpp-cm_1.0.0-SNAPSHOT_amd64.deb
RUN ldconfig
diff --git a/docker/tango/tango-archiver/data/archiver-devices.json b/docker/tango/tango-archiver/data/archiver-devices.json
index 07b8eff26..e21ac1ee9 100644
--- a/docker/tango/tango-archiver/data/archiver-devices.json
+++ b/docker/tango/tango-archiver/data/archiver-devices.json
@@ -14,7 +14,7 @@
}
}
},
- "02": {
+ "03": {
"HdbEventSubscriber": {
"archiving/hdbpp/eventsubscriber02": {
"attribute_properties": {},
@@ -34,7 +34,7 @@
"archiving/hdbpp/confmanager01": {
"attribute_properties": {},
"properties": {
- "ArchiverList": ["archiving/hdbpp/eventsubscriber01","archiving/hdbpp/eventsubscriber02"],
+ "ArchiverList": ["archiving/hdbpp/eventsubscriber01"],
"MaxSearchSize": ["1000"],
"LibConfiguration": ["host=archiver-maria-db","libname=libhdb++mysql.so.6","dbname=hdbpp","port=3306", "user=tango", "password=tango"],
"polled_attr": []
--
GitLab