From a367aaa22616c14fb97b550b38585a503662797f Mon Sep 17 00:00:00 2001
From: Matteo Di Carlo <matteo.dicarlo@inaf.it>
Date: Fri, 17 Feb 2023 10:03:04 +0100
Subject: [PATCH] ST-1502 try latest
Signed-off-by: Matteo Di Carlo <matteo.dicarlo@inaf.it>
---
charts/ska-tango-base/templates/databaseds.yaml | 2 +-
images/ska-tango-images-tango-cpp/Dockerfile | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/charts/ska-tango-base/templates/databaseds.yaml b/charts/ska-tango-base/templates/databaseds.yaml
index 95401ac2..54f6e0b6 100644
--- a/charts/ska-tango-base/templates/databaseds.yaml
+++ b/charts/ska-tango-base/templates/databaseds.yaml
@@ -152,7 +152,7 @@ spec:
- -ORBendPoint
- giop:tcp::{{ $databaseds_port }}
- -ORBendPointPublish
- - giop:tcp:{{ tpl ($databaseds_name | toString) . }}.{{ .Release.Namespace }}.svc.{{ $cluster_domain }}:{{ $databaseds_port }}
+ - giop:tcp:$(TANGO_SERVER_PUBLISH_HOSTNAME):{{ $databaseds_port }}
env:
- name: MYSQL_HOST
value: "{{ template "ska-tango-base.name" . }}-{{ .Values.tangodb.component }}:3306"
diff --git a/images/ska-tango-images-tango-cpp/Dockerfile b/images/ska-tango-images-tango-cpp/Dockerfile
index 0e496e09..46d793a5 100644
--- a/images/ska-tango-images-tango-cpp/Dockerfile
+++ b/images/ska-tango-images-tango-cpp/Dockerfile
@@ -6,7 +6,6 @@
ARG CAR_OCI_REGISTRY_HOST
ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies:9.3.11"
ARG BASE_IMAGE="ubuntu:22.04"
-ARG TANGO_VERSION="9.4.1"
FROM $BUILD_IMAGE as buildenv
ARG DEBIAN_FRONTEND=noninteractive
@@ -42,7 +41,7 @@ RUN mkdir -p /usr/src/tango
WORKDIR /usr/src/tango
RUN git clone https://gitlab.com/tango-controls/cppTango.git /usr/src/tango && \
- cd /usr/src/tango && git checkout $TANGO_VERSION && \
+ cd /usr/src/tango && \
mkdir build && \
cmake . -B build \
-DBUILD_TESTING=OFF \
--
GitLab