From 0ac35eb0c9c74437687ab531fa8d6bd68017d45b Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Fri, 23 Sep 2022 11:42:42 +0200
Subject: [PATCH] L2SS-822-introduce-dockerfile-dependencies
---
docker-compose/archiver-timescale.yml | 18 +++--
.../{tango-archiver-ts => hdbpp}/Dockerfile | 69 -------------------
docker-compose/hdbppts-cm/Dockerfile | 39 +++++++++++
docker-compose/hdbppts-es/Dockerfile | 39 +++++++++++
4 files changed, 91 insertions(+), 74 deletions(-)
rename docker-compose/{tango-archiver-ts => hdbpp}/Dockerfile (58%)
create mode 100644 docker-compose/hdbppts-cm/Dockerfile
create mode 100644 docker-compose/hdbppts-es/Dockerfile
diff --git a/docker-compose/archiver-timescale.yml b/docker-compose/archiver-timescale.yml
index 820142abf..c7fc972d7 100644
--- a/docker-compose/archiver-timescale.yml
+++ b/docker-compose/archiver-timescale.yml
@@ -33,16 +33,23 @@ services:
tag: "{{.Name}}"
restart: unless-stopped
+ hdbpp:
+ image: hdbpp
+ build:
+ context: hdbpp
+ args:
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
hdbppts-cm:
image: hdbppts-cm
build:
- context: tango-archiver-ts
+ context: hdbppts-cm
args:
- SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
+ SOURCE_IMAGE: hdbpp
container_name: ${CONTAINER_NAME_PREFIX}hdbppts-cm
networks:
- control
depends_on:
+ - hdbpp
- databaseds
- dsconfig
- archiver-timescale
@@ -62,17 +69,18 @@ services:
syslog-address: udp://${LOG_HOSTNAME}:1514
syslog-format: rfc3164
tag: "{{.Name}}"
-
hdbppts-es:
image: hdbppts-es
build:
- context: tango-archiver-ts
+ context: hdbppts-es
args:
- SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
+ SOURCE_IMAGE: hdbppts-cm
container_name: ${CONTAINER_NAME_PREFIX}hdbppts-es
networks:
- control
depends_on:
+ - hdbpp
+ - hdbppts-cm
- databaseds
- dsconfig
- archiver-timescale
diff --git a/docker-compose/tango-archiver-ts/Dockerfile b/docker-compose/hdbpp/Dockerfile
similarity index 58%
rename from docker-compose/tango-archiver-ts/Dockerfile
rename to docker-compose/hdbpp/Dockerfile
index 57f7bd708..cdfbebb25 100644
--- a/docker-compose/tango-archiver-ts/Dockerfile
+++ b/docker-compose/hdbpp/Dockerfile
@@ -93,70 +93,6 @@ RUN cd libhdbpp-timescale/build \
--requires="libpq5" \
make install
-
-# ----------- HDB++ CONFIGURATION MANAGER ---------------
-
-RUN git clone -b master https://github.com/tango-controls-hdbpp/hdbpp-cm.git
-
-RUN cd hdbpp-cm \
- && mkdir -p build \
- && cd build \
- && cmake .. -DCMAKE_PREFIX_PATH=/usr/local/include/tango \
- && make -j4
-
-RUN cd hdbpp-cm/build \
- && checkinstall \
- --install=yes \
- --fstrans=no \
- --showinstall=no \
- --backup=no \
- --type=debian \
- --pkgsource="https://github.com/tango-controls-hdbpp/hdbpp-cm" \
- --pkglicense="GPLv3" \
- --deldesc=no \
- --nodoc \
- --strip \
- --stripso \
- --maintainer="tango" \
- --pkgarch=$(dpkg --print-architecture) \
- --pkgversion="2.0.0" \
- --pkgrelease="SNAPSHOT" \
- --pkgname="hdbpp-cm" \
- --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
- make install
-
-
-# ----------- HDB++ EVENT SUBSCRIBER ---------------
-
-RUN git clone -b master https://github.com/tango-controls-hdbpp/hdbpp-es.git
-
-RUN cd hdbpp-es \
- && mkdir -p build \
- && cd build \
- && cmake .. -DCMAKE_PREFIX_PATH=/usr/local/include/tango -DFETCH_LIBHDBPP=OFF -DLIBHDBPP_BACKEND=timescale -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/local/include/postgresql \
- && make -j4
-
-RUN cd hdbpp-es/build \
- && 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="2.0.0" \
- --pkgrelease="SNAPSHOT" \
- --pkgname="hdbpp-es" \
- --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
- make install
-
RUN apt-get update && \
apt-get install -y \
build-essential && \
@@ -164,10 +100,5 @@ RUN apt-get update && \
RUN dpkg -i /libhdbpp/build/libhdbpp_2.0.0-SNAPSHOT_amd64.deb
RUN dpkg -i /libhdbpp-timescale/build/libhdbpp-timescale_2.0.0-SNAPSHOT_amd64.deb
-RUN dpkg -i /hdbpp-cm/build/hdbpp-cm_2.0.0-SNAPSHOT_amd64.deb
-RUN dpkg -i /hdbpp-es/build/hdbpp-es_2.0.0-SNAPSHOT_amd64.deb
RUN ldconfig
-
-RUN mv /usr/local/bin/hdb++cm-srv /usr/local/bin/hdbppcm-srv
-RUN mv /usr/local/bin/hdb++es-srv /usr/local/bin/hdbppes-srv
diff --git a/docker-compose/hdbppts-cm/Dockerfile b/docker-compose/hdbppts-cm/Dockerfile
new file mode 100644
index 000000000..7a4d4cd0f
--- /dev/null
+++ b/docker-compose/hdbppts-cm/Dockerfile
@@ -0,0 +1,39 @@
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
+
+# ----------- HDB++ CONFIGURATION MANAGER ---------------
+
+RUN git clone -b master https://github.com/tango-controls-hdbpp/hdbpp-cm.git
+
+RUN cd hdbpp-cm \
+ && mkdir -p build \
+ && cd build \
+ && cmake .. -DCMAKE_PREFIX_PATH=/usr/local/include/tango \
+ && make -j4
+
+RUN cd hdbpp-cm/build \
+ && checkinstall \
+ --install=yes \
+ --fstrans=no \
+ --showinstall=no \
+ --backup=no \
+ --type=debian \
+ --pkgsource="https://github.com/tango-controls-hdbpp/hdbpp-cm" \
+ --pkglicense="GPLv3" \
+ --deldesc=no \
+ --nodoc \
+ --strip \
+ --stripso \
+ --maintainer="tango" \
+ --pkgarch=$(dpkg --print-architecture) \
+ --pkgversion="2.0.0" \
+ --pkgrelease="SNAPSHOT" \
+ --pkgname="hdbpp-cm" \
+ --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
+ make install
+
+RUN dpkg -i /hdbpp-cm/build/hdbpp-cm_2.0.0-SNAPSHOT_amd64.deb
+
+RUN ldconfig
+
+RUN mv /usr/local/bin/hdb++cm-srv /usr/local/bin/hdbppcm-srv
diff --git a/docker-compose/hdbppts-es/Dockerfile b/docker-compose/hdbppts-es/Dockerfile
new file mode 100644
index 000000000..090328403
--- /dev/null
+++ b/docker-compose/hdbppts-es/Dockerfile
@@ -0,0 +1,39 @@
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
+
+# ----------- HDB++ EVENT SUBSCRIBER ---------------
+
+RUN git clone -b master https://github.com/tango-controls-hdbpp/hdbpp-es.git
+
+RUN cd hdbpp-es \
+ && mkdir -p build \
+ && cd build \
+ && cmake .. -DCMAKE_PREFIX_PATH=/usr/local/include/tango -DFETCH_LIBHDBPP=OFF -DLIBHDBPP_BACKEND=timescale -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/local/include/postgresql \
+ && make -j4
+
+RUN cd hdbpp-es/build \
+ && 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="2.0.0" \
+ --pkgrelease="SNAPSHOT" \
+ --pkgname="hdbpp-es" \
+ --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
+ make install
+
+RUN dpkg -i /hdbpp-es/build/hdbpp-es_2.0.0-SNAPSHOT_amd64.deb
+
+RUN ldconfig
+
+RUN mv /usr/local/bin/hdb++es-srv /usr/local/bin/hdbppes-srv
--
GitLab