Skip to content
Snippets Groups Projects
Commit a367aaa2 authored by Matteo Di Carlo's avatar Matteo Di Carlo
Browse files

ST-1502 try latest

parent 130aef06
No related branches found
No related tags found
No related merge requests found
...@@ -152,7 +152,7 @@ spec: ...@@ -152,7 +152,7 @@ spec:
- -ORBendPoint - -ORBendPoint
- giop:tcp::{{ $databaseds_port }} - giop:tcp::{{ $databaseds_port }}
- -ORBendPointPublish - -ORBendPointPublish
- giop:tcp:{{ tpl ($databaseds_name | toString) . }}.{{ .Release.Namespace }}.svc.{{ $cluster_domain }}:{{ $databaseds_port }} - giop:tcp:$(TANGO_SERVER_PUBLISH_HOSTNAME):{{ $databaseds_port }}
env: env:
- name: MYSQL_HOST - name: MYSQL_HOST
value: "{{ template "ska-tango-base.name" . }}-{{ .Values.tangodb.component }}:3306" value: "{{ template "ska-tango-base.name" . }}-{{ .Values.tangodb.component }}:3306"
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
ARG CAR_OCI_REGISTRY_HOST ARG CAR_OCI_REGISTRY_HOST
ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies:9.3.11" ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies:9.3.11"
ARG BASE_IMAGE="ubuntu:22.04" ARG BASE_IMAGE="ubuntu:22.04"
ARG TANGO_VERSION="9.4.1"
FROM $BUILD_IMAGE as buildenv FROM $BUILD_IMAGE as buildenv
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
...@@ -42,7 +41,7 @@ RUN mkdir -p /usr/src/tango ...@@ -42,7 +41,7 @@ RUN mkdir -p /usr/src/tango
WORKDIR /usr/src/tango WORKDIR /usr/src/tango
RUN git clone https://gitlab.com/tango-controls/cppTango.git /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 && \ mkdir build && \
cmake . -B build \ cmake . -B build \
-DBUILD_TESTING=OFF \ -DBUILD_TESTING=OFF \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment