From f34e7a0f9e3d42ef4c876b6c26c3b2ecc60377d7 Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Fri, 23 Sep 2022 20:37:05 +0200
Subject: [PATCH] L2SS-822: bug fix
---
.gitlab-ci.yml | 2 +-
docker-compose/archiver-timescale.yml | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4eb432f86..653f67464 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -490,7 +490,7 @@ docker_build_image_hdbpp:
- docker-compose/hdbpp/*
script:
# Do not remove 'bash' or statement will be ignored by primitive docker shell
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh hdbppts-cm $tag
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh hdbpp $tag
docker_build_image_hdbppts_cm:
extends: .base_docker_images_except
only:
diff --git a/docker-compose/archiver-timescale.yml b/docker-compose/archiver-timescale.yml
index c7fc972d7..a2e05c4eb 100644
--- a/docker-compose/archiver-timescale.yml
+++ b/docker-compose/archiver-timescale.yml
@@ -39,6 +39,18 @@ services:
context: hdbpp
args:
SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
+ container_name: ${CONTAINER_NAME_PREFIX}hdbpp
+ networks:
+ - control
+ depends_on:
+ - databaseds
+ - dsconfig
+ - archiver-timescale
+ extra_hosts:
+ - "host.docker.internal:host-gateway"
+ environment:
+ - TANGO_HOST=${TANGO_HOST}
+
hdbppts-cm:
image: hdbppts-cm
build:
@@ -69,6 +81,7 @@ services:
syslog-address: udp://${LOG_HOSTNAME}:1514
syslog-format: rfc3164
tag: "{{.Name}}"
+
hdbppts-es:
image: hdbppts-es
build:
--
GitLab