diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7059b64fdf10c77ba1197bc8b2c1120812bcc90f..2fd401fee6017395023687fbf750b30ad077910d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -642,3 +642,11 @@ include:
file: 'gitlab-ci/includes/changelog.gitlab-ci.yml'
+
+##### Test k8s
+k8s-test:
+ before_script:
+ - '[ -f .make/k8s.mk ] || (echo "File k8s.mk not included in Makefile; exit 1")'
+ - 'make help | grep k8s-test'
+ - make k8s-install-chart CAR_OCI_REGISTRY_HOST=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}
+ - make k8s-wait
\ No newline at end of file
diff --git a/Makefile b/Makefile
index dd8950d057f58bfe903941a024469680be8230a0..b53e69ff82e81508b88dd1c27645f08315880539 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ BASE = $(shell pwd)
HELM_CHARTS ?= ska-tango-util ska-tango-base
HELM_CHARTS_TO_PUBLISH ?= $(HELM_CHARTS)
-OCI_IMAGES ?= ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies-alpine ska-tango-images-tango-db ska-tango-images-tango-db-alpine ska-tango-images-tango-cpp ska-tango-images-tango-cpp-alpine ska-tango-images-tango-java ska-tango-images-tango-java-alpine ska-tango-images-tango-rest ska-tango-images-tango-rest-alpine ska-tango-images-pytango-builder ska-tango-images-pytango-builder-alpine ska-tango-images-tango-pogo ska-tango-images-tango-libtango ska-tango-images-tango-jive ska-tango-images-pytango-runtime ska-tango-images-pytango-runtime-alpine ska-tango-images-tango-admin ska-tango-images-tango-databaseds ska-tango-images-tango-test ska-tango-images-tango-dsconfig ska-tango-images-tango-dsconfig-alpine ska-tango-images-tango-itango ska-tango-images-tango-itango-alpine ska-tango-images-tango-vnc ska-tango-images-tango-pytango ska-tango-images-tango-panic ska-tango-images-tango-panic-gui
+OCI_IMAGES ?= ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies-alpine ska-tango-images-tango-db ska-tango-images-tango-db-alpine ska-tango-images-tango-cpp ska-tango-images-tango-cpp-alpine ska-tango-images-tango-java ska-tango-images-tango-java-alpine ska-tango-images-tango-rest ska-tango-images-tango-rest-alpine ska-tango-images-pytango-builder ska-tango-images-pytango-builder-alpine ska-tango-images-tango-pogo ska-tango-images-tango-libtango ska-tango-images-tango-jive ska-tango-images-pytango-runtime ska-tango-images-pytango-runtime-alpine ska-tango-images-tango-admin ska-tango-images-tango-databaseds ska-tango-images-tango-test ska-tango-images-tango-dsconfig ska-tango-images-tango-dsconfig-alpine ska-tango-images-tango-itango ska-tango-images-tango-itango-alpine ska-tango-images-tango-vnc ska-tango-images-tango-pytango ska-tango-images-tango-pytango-alpine ska-tango-images-tango-panic ska-tango-images-tango-panic-gui
OCI_IMAGES_TO_PUBLISH ?= $(OCI_IMAGES)
KUBE_NAMESPACE ?= ska-tango-images#namespace to be used
@@ -19,7 +19,7 @@ K8S_CHARTS ?= ska-tango-util ska-tango-base ska-tango-umbrella## list of charts
CI_PROJECT_PATH_SLUG ?= ska-tango-images
CI_ENVIRONMENT_SLUG ?= ska-tango-images
-K8S_CHART_PARAMS ?= --set global.minikube=$(MINIKUBE) --set global.tango_host=$(TANGO_HOST) --set global.device_server_port=$(TANGO_SERVER_PORT)
+K8S_CHART_PARAMS ?= --set global.minikube=$(MINIKUBE) --set global.exposeDatabaseDS=$(MINIKUBE) --set global.exposeAllDS=$(MINIKUBE) --set global.tango_host=$(TANGO_HOST) --set global.device_server_port=$(TANGO_SERVER_PORT)
# K8S_TEST_MAKE_PARAMS = KUBE_NAMESPACE=$(KUBE_NAMESPACE) HELM_RELEASE=$(RELEASE_NAME) TANGO_HOST=$(TANGO_HOST) MARK=$(MARK)
# K8S_CHART_PARAMS = --set global.minikube=$(MINIKUBE) --set global.tango_host=$(TANGO_HOST) --values $(BASE)/charts/values.yaml
diff --git a/charts/ska-tango-base/Chart.yaml b/charts/ska-tango-base/Chart.yaml
index 6f472bee506dddf85990b5513286eecd5f23a12b..d2f1c940d6616f4c9e58ad1ff6d99b5a62a75dc7 100644
--- a/charts/ska-tango-base/Chart.yaml
+++ b/charts/ska-tango-base/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
appVersion: 0.3.10
description: A Helm chart for deploying the TANGO base system on Kubernetes
name: ska-tango-base
-version: 0.3.7
+version: 0.3.8
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies:
- name: ska-tango-util
- version: 0.3.6
+ version: 0.3.7
repository: file://../ska-tango-util
diff --git a/charts/ska-tango-base/templates/databaseds.yaml b/charts/ska-tango-base/templates/databaseds.yaml
index bd8bbae25538e70bd8294d1f62059a4a52116d21..ae51e043af38393827c6e148143cca946c293e93 100644
--- a/charts/ska-tango-base/templates/databaseds.yaml
+++ b/charts/ska-tango-base/templates/databaseds.yaml
@@ -35,7 +35,7 @@ spec:
---
## The LoadBalancer for external access
-{{ if .Values.global.minikube }}
+{{ if or (.Values.global.minikube) (.Values.global.exposeAllDS) }}
apiVersion: v1
kind: Service
metadata:
diff --git a/charts/ska-tango-base/values.yaml.sh b/charts/ska-tango-base/values.yaml.sh
index 134d0554485d449c011985322d4a583e4dd63f40..7471afe41e3dc57db9d9e307c5731c2f1c6acb4c 100644
--- a/charts/ska-tango-base/values.yaml.sh
+++ b/charts/ska-tango-base/values.yaml.sh
@@ -43,6 +43,8 @@ xauthority: "~/.Xauthority"
global:
minikube: false
+ exposeDatabaseDS: false
+ exposeAllDS: false
cluster_domain: cluster.local
tango_host: databaseds-tango-base:10000
databaseds_port: 10000
diff --git a/charts/ska-tango-umbrella/Chart.yaml b/charts/ska-tango-umbrella/Chart.yaml
index a109486c931f1fb0baf5672a219949cc05f6d417..5d9909e437dc37705600b25d6a54833337bd7088 100644
--- a/charts/ska-tango-umbrella/Chart.yaml
+++ b/charts/ska-tango-umbrella/Chart.yaml
@@ -2,14 +2,14 @@ apiVersion: v2
appVersion: 0.2.0
description: A Helm chart for deploying the TANGO base system on Kubernetes
name: ska-tango-umbrella
-version: 0.2.0
+version: 0.2.1
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies:
- name: ska-tango-base
- version: 0.3.7
+ version: 0.3.8
repository: file://../ska-tango-base
condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled
- name: ska-tango-util
- version: 0.3.6
+ version: 0.3.7
repository: file://../ska-tango-util
diff --git a/charts/ska-tango-util/Chart.yaml b/charts/ska-tango-util/Chart.yaml
index 7835c430bc426f160af8c74c6f93c99538bce931..2ef9bc6cd32b538ec59aea8221a081c2a9414187 100644
--- a/charts/ska-tango-util/Chart.yaml
+++ b/charts/ska-tango-util/Chart.yaml
@@ -3,7 +3,7 @@ description: A Helm chart library of utilities for TANGO deployents
name: ska-tango-util
type: library
appVersion: 0.3.10
-version: 0.3.6
+version: 0.3.7
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
maintainers:
- name: Matteo Di Carlo
diff --git a/charts/ska-tango-util/templates/_multidevice-svc.yaml b/charts/ska-tango-util/templates/_multidevice-svc.yaml
index d335d498030dfcfa55e525ca47d02cbb0299bca3..31135417cac2d6ba2c88236d08c07a2f3e25b2cd 100644
--- a/charts/ska-tango-util/templates/_multidevice-svc.yaml
+++ b/charts/ska-tango-util/templates/_multidevice-svc.yaml
@@ -13,6 +13,8 @@ Parameters:
{{ $default_tango_host := printf "%s-%s:10000" "databaseds-tango-base-" .local.Release.Name }}
{{ $tango_host := tpl (coalesce .local.Values.global.tango_host .local.Values.tango_host $default_tango_host | toString) .local }}
{{ $tango_server_port := coalesce .local.Values.global.device_server_port "45450" }}
+{{ $tango_heartbeat_port := coalesce .local.Values.global.device_heartbeat_port "45460" }}
+{{ $tango_event_port := coalesce .local.Values.global.device_event_port "45470" }}
{{ $cluster_domain := coalesce .local.Values.global.cluster_domain "cluster.local" }}
{{ $dsconfig := coalesce .local.Values.global.dsconfig .local.Values.dsconfig}}
{{ $chart := .local }}
@@ -73,9 +75,52 @@ spec:
- name: tango-server
port: {{ $tango_server_port }}
targetPort: {{ $tango_server_port }}
+ - name: tango-heartbeat
+ port: {{ $tango_heartbeat_port }}
+ targetPort: {{ $tango_heartbeat_port }}
+ - name: tango-event
+ port: {{ $tango_event_port }}
+ targetPort: {{ $tango_event_port }}
selector:
subsystem: {{ $chart.Values.subsystem }}
component: {{tpl ($deviceserver_name | toString) $chart }}-{{ $safe_instance }}
+
+## The LoadBalancer for external access
+{{ if or ($chart.Values.global.minikube) ($chart.Values.global.exposeAllDS) ($deviceserver.exposeDS) }}
+---
+apiVersion: v1
+kind: Service
+
+metadata:
+ name: {{$deviceserver_name | toString }}-{{ $safe_instance }}-external
+ namespace: {{ $chart.Release.Namespace }}
+ labels:
+{{ toYaml $labels | indent 4 }}
+ component: {{tpl ($deviceserver_name | toString) $chart }}-{{ $safe_instance }}
+ function: {{ $deviceserver.function }}
+ domain: {{ $deviceserver.domain }}
+ subsystem: {{ $chart.Values.subsystem }}
+{{ if $annotations }}
+ annotations:
+{{ toYaml $annotations | indent 4 }}
+{{ end }}
+spec:
+ ports:
+ - name: tango-server
+ port: {{ $tango_server_port }}
+ targetPort: {{ $tango_server_port }}
+ - name: tango-heartbeat
+ port: {{ $tango_heartbeat_port }}
+ targetPort: {{ $tango_heartbeat_port }}
+ - name: tango-event
+ port: {{ $tango_event_port }}
+ targetPort: {{ $tango_event_port }}
+ selector:
+ subsystem: {{ $chart.Values.subsystem }}
+ component: {{tpl ($deviceserver_name | toString) $chart }}-{{ $safe_instance }}
+ type: LoadBalancer
+{{ end }}
+
---
apiVersion: apps/v1
kind: StatefulSet
@@ -215,6 +260,10 @@ spec:
ports:
- containerPort: {{ $tango_server_port }}
name: tango-server
+ - containerPort: {{ $tango_heartbeat_port }}
+ name: tango-heartbeat
+ - containerPort: {{ $tango_event_port }}
+ name: tango-event
volumeMounts:
- name: configuration
mountPath: data
@@ -276,6 +325,10 @@ spec:
value: {{ $tango_host }}
- name: TANGO_SERVER_PORT
value: "{{ $tango_server_port }}"
+ - name: TANGO_ZMQ_HEARTBEAT_PORT
+ value: "{{ $tango_heartbeat_port }}"
+ - name: TANGO_ZMQ_EVENT_PORT
+ value: "{{ $tango_event_port }}"
- name: TANGO_SERVER_PUBLISH_HOSTNAME
value: {{$deviceserver_name | toString }}-{{ $safe_instance }}.{{ $chart.Release.Namespace }}.svc.{{ $cluster_domain }}
{{- if $chart.Values.global.environment_variables }}
diff --git a/images/ska-tango-images-pytango-builder-alpine/.release b/images/ska-tango-images-pytango-builder-alpine/.release
index 2d05ed4489e32bcd48cf318bc2e200154d0f4201..a656626b3f87a26a0d929117a5e0b1d620d8058f 100644
--- a/images/ska-tango-images-pytango-builder-alpine/.release
+++ b/images/ska-tango-images-pytango-builder-alpine/.release
@@ -1,2 +1,2 @@
-release=9.3.14
-tag=9.3.14
\ No newline at end of file
+release=9.3.15
+tag=9.3.15
\ No newline at end of file
diff --git a/images/ska-tango-images-pytango-builder-alpine/requirements.txt b/images/ska-tango-images-pytango-builder-alpine/requirements.txt
index 278a9915e601f0b84296006d5ad12593227d9594..ba99c5e5dc53ba0fbbbe931f09d0d33d11a5da5e 100644
--- a/images/ska-tango-images-pytango-builder-alpine/requirements.txt
+++ b/images/ska-tango-images-pytango-builder-alpine/requirements.txt
@@ -1,5 +1,6 @@
numpy==1.21.0
pytango==9.3.3
+# git+https://gitlab.com/tango-controls/pytango.git@main#egg=pytango
flake8
flake8_formatter_junit_xml
isort
diff --git a/images/ska-tango-images-pytango-builder/.release b/images/ska-tango-images-pytango-builder/.release
index 8be42b7970385dd2a01908999ba4ce5053d37931..b65814fbbdb70840a87c422c8a3032263853d8d5 100644
--- a/images/ska-tango-images-pytango-builder/.release
+++ b/images/ska-tango-images-pytango-builder/.release
@@ -1,3 +1,3 @@
-release=9.3.27
-tag=9.3.27
+release=9.3.17
+tag=9.3.17
diff --git a/images/ska-tango-images-pytango-builder/Dockerfile b/images/ska-tango-images-pytango-builder/Dockerfile
index 1ca90a64acce4c570d2630d63611a0cfb425d833..a9de5420240dca915f7f753bfa9395722ede2bbd 100644
--- a/images/ska-tango-images-pytango-builder/Dockerfile
+++ b/images/ska-tango-images-pytango-builder/Dockerfile
@@ -37,6 +37,8 @@ RUN apt-get update \
libboost-python-dev \
pkg-config \
python3-distutils \
+ python3-setuptools \
+ python3-wheel \
zlib1g-dev \
ca-certificates \
curl \
@@ -45,8 +47,6 @@ RUN apt-get update \
RUN curl -k https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py
COPY pip.conf /etc/pip.conf
-RUN python3 -m pip install setuptools wheel
-
WORKDIR /app
# Install numpy manually before PyTango and other requirements to ensure we
diff --git a/images/ska-tango-images-pytango-runtime-alpine/.release b/images/ska-tango-images-pytango-runtime-alpine/.release
index 307e82a41522273ee8351c58be94d4bf30db972a..62121f15ddfd0d4a4e88dd13bf15cbd3206577ce 100644
--- a/images/ska-tango-images-pytango-runtime-alpine/.release
+++ b/images/ska-tango-images-pytango-runtime-alpine/.release
@@ -1,2 +1,2 @@
-release=9.3.14
-tag=9.3.14
+release=9.3.15
+tag=9.3.15
diff --git a/images/ska-tango-images-pytango-runtime/.release b/images/ska-tango-images-pytango-runtime/.release
index 307e82a41522273ee8351c58be94d4bf30db972a..62121f15ddfd0d4a4e88dd13bf15cbd3206577ce 100644
--- a/images/ska-tango-images-pytango-runtime/.release
+++ b/images/ska-tango-images-pytango-runtime/.release
@@ -1,2 +1,2 @@
-release=9.3.14
-tag=9.3.14
+release=9.3.15
+tag=9.3.15
diff --git a/images/ska-tango-images-tango-admin/.release b/images/ska-tango-images-tango-admin/.release
index 71034b439e30d3565d42cdc82531f83e4f34fe1f..8898ccf4068b0643c73a7d28846a809e9d61c959 100644
--- a/images/ska-tango-images-tango-admin/.release
+++ b/images/ska-tango-images-tango-admin/.release
@@ -1,2 +1,2 @@
-release=1.15.4
-tag=1.15.4
+release=1.15.5
+tag=1.15.5
diff --git a/images/ska-tango-images-tango-cpp-alpine/.release b/images/ska-tango-images-tango-cpp-alpine/.release
index 27baa2de2998ca965f64f84bfe9cfd3a2d14b271..31adb7e2589cb095d6c86aee57ada1fc28bdade0 100644
--- a/images/ska-tango-images-tango-cpp-alpine/.release
+++ b/images/ska-tango-images-tango-cpp-alpine/.release
@@ -1,2 +1,2 @@
-release=9.3.9
-tag=9.3.9
+release=9.3.10
+tag=9.3.10
diff --git a/images/ska-tango-images-tango-cpp-alpine/Dockerfile b/images/ska-tango-images-tango-cpp-alpine/Dockerfile
index 96d104027c448e5e6f9a2cc1d1522f64e78f2c02..e3f963be0a2e953168189ecb5cda28ef5664da40 100644
--- a/images/ska-tango-images-tango-cpp-alpine/Dockerfile
+++ b/images/ska-tango-images-tango-cpp-alpine/Dockerfile
@@ -11,35 +11,36 @@ RUN apk --update add --no-cache make bash\
# build and install tangoidl
RUN git clone --depth 1 https://gitlab.com/tango-controls/tango-idl.git /idl && \
cmake -B /idl/build -DCMAKE_INSTALL_PREFIX=/usr/local/ /idl && \
- make -j$(nproc) -C /idl/build install
+ make -j$(nproc) -C /idl/build install
## build and install cppTango
## latest main version is not working using previous commit
-RUN git clone https://gitlab.com/tango-controls/cppTango /cppTango && \
- cd /cppTango && git checkout 1575524ada0a3f8fe97b4040c07da7c83fced325 && \
+
+RUN git clone https://gitlab.com/tango-controls/cppTango.git /cppTango && \
+ cd /cppTango && git checkout 9.3.5-rc1 && \
sed -i '1s/^/#include <sys\/types.h>\n#include <bits\/alltypes.h>\n/' /cppTango/log4tango/include/log4tango/FileAppender.hh && \
- mkdir build && \
- cmake . -B build \
- -DBUILD_TESTING=OFF \
- -DCPPZMQ_BASE=/usr/local/ \
- -DIDL_BASE=/usr/local/ \
- -DOMNI_BASE=/usr/local/ \
- -DZMQ_BASE=/usr/local/ && \
+ mkdir build && \
+ cmake . -B build \
+ -DBUILD_TESTING=OFF \
+ -DCPPZMQ_BASE=/usr/local/ \
+ -DIDL_BASE=/usr/local/ \
+ -DOMNI_BASE=/usr/local/ \
+ -DZMQ_BASE=/usr/local/ && \
make -j$(nproc) -C build && \
- make -C build install
+ make -C build install
# build and install tango_admin
RUN git clone https://gitlab.com/tango-controls/tango_admin.git /tango_admin && \
cmake -B /tango_admin/build -DCMAKE_INSTALL_PREFIX=/usr/local/ /tango_admin && \
- make -j$(nproc) -C /tango_admin/build install
+ make -j$(nproc) -C /tango_admin/build install
# build and install TangoDatabase
RUN git clone --depth 1 https://gitlab.com/tango-controls/TangoDatabase.git /TangoDatabase && \
cmake -B /TangoDatabase/build -DCMAKE_INSTALL_PREFIX=/usr/local/ /TangoDatabase && \
- make -j$(nproc) -C /TangoDatabase/build install
+ make -j$(nproc) -C /TangoDatabase/build install
# Now, create the final image minus the tools and source code
-FROM $BASE_IMAGE
+FROM $BASE_IMAGE
LABEL \
author="Piers Harding <Piers.Harding@skao.int>" \
description="This image illustrates build dependencies" \
@@ -52,11 +53,10 @@ LABEL \
COPY --from=buildenv /usr/local /usr/local
RUN apk --update add --no-cache sudo libstdc++ bash libsodium-dev mariadb-connector-c \
- && ln -s /usr/local/lib/libtango.so.9.4.0 /usr/local/lib/libtango.so.9 \
# for some reason we are getting the wrong DataBaseds name
&& ln -s /usr/local/bin/Databaseds /usr/local/bin/DataBaseds \
# also create the user tango and add it to sudoers
&& adduser -h /home/tango -s /bin/bash -D tango \
- && echo "tango ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/tango
+ && echo "tango ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/tango
-USER tango
\ No newline at end of file
+USER tango
diff --git a/images/ska-tango-images-tango-cpp/.release b/images/ska-tango-images-tango-cpp/.release
index 27baa2de2998ca965f64f84bfe9cfd3a2d14b271..31adb7e2589cb095d6c86aee57ada1fc28bdade0 100644
--- a/images/ska-tango-images-tango-cpp/.release
+++ b/images/ska-tango-images-tango-cpp/.release
@@ -1,2 +1,2 @@
-release=9.3.9
-tag=9.3.9
+release=9.3.10
+tag=9.3.10
diff --git a/images/ska-tango-images-tango-cpp/Dockerfile b/images/ska-tango-images-tango-cpp/Dockerfile
index 587b173e600ee2ca3447d4a9d258997b70511228..602df55f261bccb6bdfb7340404ba6c7c13ecd61 100644
--- a/images/ska-tango-images-tango-cpp/Dockerfile
+++ b/images/ska-tango-images-tango-cpp/Dockerfile
@@ -8,23 +8,58 @@ ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies:9.
ARG BASE_IMAGE="debian:buster-slim"
FROM $BUILD_IMAGE as buildenv
-ENV TANGO_DOWNLOAD_URL=https://artefact.skao.int/repository/raw-internal/ska-tango-images/libraries/tango-9.3.4.tar.gz
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get -y install --no-install-recommends \
- build-essential ca-certificates curl file libmariadbclient-dev libmariadbclient-dev-compat pkg-config python
+ build-essential \
+ ca-certificates \
+ cmake \
+ curl \
+ file \
+ git \
+ libmariadbclient-dev \
+ libmariadbclient-dev-compat \
+ pkg-config python
+
+
+# build and install tangoidl
+
+RUN mkdir -p /usr/src/idl
+WORKDIR /usr/src/idl
+
+RUN git clone --depth 1 https://gitlab.com/tango-controls/tango-idl.git /usr/src/idl && \
+ mkdir -p /usr/src/idl/build && \
+ cmake -B /usr/src/idl/build -DCMAKE_INSTALL_PREFIX=/usr/local/ /usr/src/idl && \
+ make -j$(nproc) -C /usr/src/idl/build install
RUN mkdir -p /usr/src/tango
WORKDIR /usr/src/tango
-RUN curl -fsSL "$TANGO_DOWNLOAD_URL" -o tango.tar.gz \
- && tar xf tango.tar.gz -C /usr/src/tango --strip-components=1 \
- && ./configure --with-zmq=/usr/local --with-omni=/usr/local --with-mysqlclient-prefix=/usr --enable-static=no \
- && make -C /usr/src/tango -j$(nproc) \
- && make -C /usr/src/tango install \
- && ldconfig \
- && rm -r /usr/src/tango
+RUN git clone https://gitlab.com/tango-controls/cppTango.git /usr/src/tango && \
+ cd /usr/src/tango && git checkout 9.3.5-rc1 && \
+ mkdir build && \
+ cmake . -B build \
+ -DBUILD_TESTING=OFF \
+ -DCPPZMQ_BASE=/usr/local/ \
+ -DIDL_BASE=/usr/local/ \
+ -DOMNI_BASE=/usr/local/ \
+ -DZMQ_BASE=/usr/local/ && \
+ make -C /usr/src/tango/build -j$(nproc) && \
+ make -C /usr/src/tango/build install && \
+ ldconfig && \
+ rm -r /usr/src/tango
+
+# build and install tango_admin
+RUN git clone https://gitlab.com/tango-controls/tango_admin.git /usr/src/tango_admin && \
+ cmake -B /usr/src/tango_admin/build -DCMAKE_INSTALL_PREFIX=/usr/local/ /usr/src/tango_admin && \
+ make -j$(nproc) -C /usr/src/tango_admin/build install
+
+# build and install TangoDatabase
+RUN git clone --depth 1 https://gitlab.com/tango-controls/TangoDatabase.git /usr/src/TangoDatabase && \
+ cmake -B /usr/src/TangoDatabase/build -DCMAKE_INSTALL_PREFIX=/usr/local/ /usr/src/TangoDatabase && \
+ make -j$(nproc) -C /usr/src/TangoDatabase/build install
+
FROM $BASE_IMAGE
@@ -45,7 +80,9 @@ RUN apt-get update && \
RUN useradd --create-home --home-dir /home/tango tango
-RUN echo "tango ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/tango \
- && chmod 0440 /etc/sudoers.d/tango
+RUN \
+ echo "tango ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/tango && \
+ chmod 0440 /etc/sudoers.d/tango && \
+ ln -s /usr/local/bin/Databaseds /usr/local/bin/DataBaseds
USER tango
diff --git a/images/ska-tango-images-tango-databaseds/.release b/images/ska-tango-images-tango-databaseds/.release
index 76776996e64f082489020adce5a712307bf30088..4d2f92b325f296be783b4fd1d64ae40bd372e0b7 100644
--- a/images/ska-tango-images-tango-databaseds/.release
+++ b/images/ska-tango-images-tango-databaseds/.release
@@ -1,2 +1,2 @@
-release=5.16.4
-tag=5.16.4
+release=5.16.5
+tag=5.16.5
diff --git a/images/ska-tango-images-tango-db-alpine/.release b/images/ska-tango-images-tango-db-alpine/.release
index 4966b9a7c3f47c03519ce83e7e3a567e2ed80e58..248c7a9e13b4b9d0d5c5dcd9e9696131d6eb01ec 100644
--- a/images/ska-tango-images-tango-db-alpine/.release
+++ b/images/ska-tango-images-tango-db-alpine/.release
@@ -1,2 +1,2 @@
-release=0.0.2
-tag=ska-tango-images-tango-db-alpine-0.0.2
+release=0.0.3
+tag=0.0.3
diff --git a/images/ska-tango-images-tango-db/.release b/images/ska-tango-images-tango-db/.release
index 1fe770f380cfab168e7acfd4cc5f6cb59515876e..cf50f6a01f5c4b74ffbd0a0adc211902a001dfee 100644
--- a/images/ska-tango-images-tango-db/.release
+++ b/images/ska-tango-images-tango-db/.release
@@ -1,2 +1,2 @@
-release=10.4.14
-tag=10.4.14
+release=10.4.15
+tag=10.4.15
diff --git a/images/ska-tango-images-tango-dependencies-alpine/.release b/images/ska-tango-images-tango-dependencies-alpine/.release
index 84f583f44a8433d53731f62dc5fd14553cfe80ec..e35fea83e96908494c86fc38ab7b3ace00b841fc 100644
--- a/images/ska-tango-images-tango-dependencies-alpine/.release
+++ b/images/ska-tango-images-tango-dependencies-alpine/.release
@@ -1,2 +1,2 @@
-release=9.3.5
-tag=9.3.5
+release=9.3.6
+tag=9.3.6
diff --git a/images/ska-tango-images-tango-dependencies/.release b/images/ska-tango-images-tango-dependencies/.release
index ab56194b0accd9291353bf9870a347212f81d71b..27baa2de2998ca965f64f84bfe9cfd3a2d14b271 100644
--- a/images/ska-tango-images-tango-dependencies/.release
+++ b/images/ska-tango-images-tango-dependencies/.release
@@ -1,2 +1,2 @@
-release=9.3.8
-tag=9.3.8
+release=9.3.9
+tag=9.3.9
diff --git a/images/ska-tango-images-tango-dependencies/Dockerfile b/images/ska-tango-images-tango-dependencies/Dockerfile
index 8ad268044322777092d058cfc364b2ddac0355f7..995e26ed454600a2333d96f7cfd4c3d7d2cde6d0 100644
--- a/images/ska-tango-images-tango-dependencies/Dockerfile
+++ b/images/ska-tango-images-tango-dependencies/Dockerfile
@@ -6,9 +6,9 @@
ARG BASE_IMAGE="debian:buster-slim"
FROM $BASE_IMAGE as buildenv
-ENV ZEROMQ_DOWNLOAD_URL=https://github.com/zeromq/libzmq/archive/v4.3.2.tar.gz
-ENV CPPZMQ_DOWNLOAD_URL=https://github.com/zeromq/cppzmq/archive/v4.4.1.tar.gz
-ENV OMNIORB_DOWNLOAD_URL=https://artefact.skao.int/repository/raw-internal/ska-tango-images/libraries/omniORB-4.2.3.tar.bz2
+ENV ZEROMQ_DOWNLOAD_URL=https://github.com/zeromq/libzmq/archive/v4.3.4.tar.gz
+ENV CPPZMQ_DOWNLOAD_URL=https://github.com/zeromq/cppzmq/archive/v4.8.1.tar.gz
+ENV OMNIORB_DOWNLOAD_URL=https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.4/omniORB-4.2.4.tar.bz2/download
ENV DEBIAN_FRONTEND=noninteractive
# Copy across files that are used to help orchestrate container compositions
@@ -22,8 +22,8 @@ RUN apt-get update && \
curl libkrb5-dev libtool pkg-config unzip \
cmake python-dev python-pkgconfig
-RUN mkdir /usr/src/zeromq
-WORKDIR /usr/src/zeromq
+RUN mkdir /usr/src/zeromq
+WORKDIR /usr/src/zeromq
RUN curl -kfsSL "$ZEROMQ_DOWNLOAD_URL" -o zeromq.tar.gz \
&& tar xf zeromq.tar.gz -C /usr/src/zeromq --strip-components=1 \
&& ./autogen.sh \
@@ -32,7 +32,7 @@ RUN curl -kfsSL "$ZEROMQ_DOWNLOAD_URL" -o zeromq.tar.gz \
&& make -C /usr/src/zeromq install \
&& rm -r /usr/src/zeromq
-RUN mkdir /usr/src/cppzmq
+RUN mkdir /usr/src/cppzmq
WORKDIR /usr/src/cppzmq
RUN curl -kfsSL "$CPPZMQ_DOWNLOAD_URL" -o cppzmq.tar.gz \
&& tar xf cppzmq.tar.gz -C /usr/src/cppzmq --strip-components=1 \
@@ -43,7 +43,7 @@ RUN curl -kfsSL "$CPPZMQ_DOWNLOAD_URL" -o cppzmq.tar.gz \
&& apt-get purge -y --auto-remove $buildDeps \
&& rm -r /usr/src/cppzmq
-RUN mkdir /usr/src/omniorb
+RUN mkdir /usr/src/omniorb
WORKDIR /usr/src/omniorb
RUN curl -kfsSL "$OMNIORB_DOWNLOAD_URL" -o omniorb.tar.bz2 \
&& tar xf omniorb.tar.bz2 -C /usr/src/omniorb --strip-components=1 \
@@ -65,4 +65,3 @@ LABEL \
int.skao.application="Tango dependencies"
COPY --from=buildenv /usr/local /usr/local
-
diff --git a/images/ska-tango-images-tango-dsconfig-alpine/.release b/images/ska-tango-images-tango-dsconfig-alpine/.release
index d0e102777ec11cad93aaed538b35ce3941f6f23a..3b8332af60be9ff8bd9aa718e3eb4261fb3fb5f1 100644
--- a/images/ska-tango-images-tango-dsconfig-alpine/.release
+++ b/images/ska-tango-images-tango-dsconfig-alpine/.release
@@ -1,2 +1,2 @@
-release=1.5.3
-tag=ska-tango-images-tango-dsconfig-alpine-1.5.3
+release=1.5.4
+tag=1.5.4
diff --git a/images/ska-tango-images-tango-dsconfig/.release b/images/ska-tango-images-tango-dsconfig/.release
index 3705631d84e536fc69561ed277186621929180b2..3b8332af60be9ff8bd9aa718e3eb4261fb3fb5f1 100644
--- a/images/ska-tango-images-tango-dsconfig/.release
+++ b/images/ska-tango-images-tango-dsconfig/.release
@@ -1,2 +1,2 @@
-release=1.5.3
-tag=1.5.3
+release=1.5.4
+tag=1.5.4
diff --git a/images/ska-tango-images-tango-itango-alpine/.release b/images/ska-tango-images-tango-itango-alpine/.release
index ac8d4a1e18d93bc891ddd498f7be94c554ee1893..ab56194b0accd9291353bf9870a347212f81d71b 100644
--- a/images/ska-tango-images-tango-itango-alpine/.release
+++ b/images/ska-tango-images-tango-itango-alpine/.release
@@ -1,2 +1,2 @@
-release=9.3.7
-tag=ska-tango-images-tango-itango-alpine-9.3.7
+release=9.3.8
+tag=9.3.8
diff --git a/images/ska-tango-images-tango-itango/.release b/images/ska-tango-images-tango-itango/.release
index d893a903d5d559c64d46fdfa841c7a60be939cd2..ab56194b0accd9291353bf9870a347212f81d71b 100644
--- a/images/ska-tango-images-tango-itango/.release
+++ b/images/ska-tango-images-tango-itango/.release
@@ -1,2 +1,2 @@
-release=9.3.7
-tag=9.3.7
+release=9.3.8
+tag=9.3.8
diff --git a/images/ska-tango-images-tango-itango/requirements.txt b/images/ska-tango-images-tango-itango/requirements.txt
index e4666223138ac5725b957a48f546bd2529ba162c..9b091db918e2b09d9261da342229e76947661b2f 100644
--- a/images/ska-tango-images-tango-itango/requirements.txt
+++ b/images/ska-tango-images-tango-itango/requirements.txt
@@ -2,7 +2,7 @@ pytest
pyyaml
pytest-cov
pytest-json-report
-pycodestyle<2.7.0,>=2.6.0a1
+pycodestyle==2.8.0
pytest-bdd==3.4.0
pytest-ordering
pytest-timeout
@@ -17,5 +17,5 @@ aiojobs
pytest-asyncio
aiohttp_cors
flake8
-tango-simlib>=0.9.0
+tango-simlib==0.5.0
tabulate
diff --git a/images/ska-tango-images-tango-java-alpine/.release b/images/ska-tango-images-tango-java-alpine/.release
index e35fea83e96908494c86fc38ab7b3ace00b841fc..d893a903d5d559c64d46fdfa841c7a60be939cd2 100644
--- a/images/ska-tango-images-tango-java-alpine/.release
+++ b/images/ska-tango-images-tango-java-alpine/.release
@@ -1,2 +1,2 @@
-release=9.3.6
-tag=9.3.6
+release=9.3.7
+tag=9.3.7
diff --git a/images/ska-tango-images-tango-java/.release b/images/ska-tango-images-tango-java/.release
index e35fea83e96908494c86fc38ab7b3ace00b841fc..d893a903d5d559c64d46fdfa841c7a60be939cd2 100644
--- a/images/ska-tango-images-tango-java/.release
+++ b/images/ska-tango-images-tango-java/.release
@@ -1,2 +1,2 @@
-release=9.3.6
-tag=9.3.6
+release=9.3.7
+tag=9.3.7
diff --git a/images/ska-tango-images-tango-jive/.release b/images/ska-tango-images-tango-jive/.release
index f0946f1bd58f5bee463f828e4cf83f01c1bea96d..31006f9fc49ff7098cab27750f1803d13f132858 100644
--- a/images/ska-tango-images-tango-jive/.release
+++ b/images/ska-tango-images-tango-jive/.release
@@ -1,2 +1,2 @@
-release=7.22.4
-tag=7.22.4
+release=7.22.5
+tag=7.22.5
diff --git a/images/ska-tango-images-tango-libtango/.release b/images/ska-tango-images-tango-libtango/.release
index d893a903d5d559c64d46fdfa841c7a60be939cd2..ab56194b0accd9291353bf9870a347212f81d71b 100644
--- a/images/ska-tango-images-tango-libtango/.release
+++ b/images/ska-tango-images-tango-libtango/.release
@@ -1,2 +1,2 @@
-release=9.3.7
-tag=9.3.7
+release=9.3.8
+tag=9.3.8
diff --git a/images/ska-tango-images-tango-panic-gui/.release b/images/ska-tango-images-tango-panic-gui/.release
index ad405e826129d92a28ff1236f4a1253fb2615c9a..d7b12ab0df0211c23a0c8af543ab22d7326036c5 100644
--- a/images/ska-tango-images-tango-panic-gui/.release
+++ b/images/ska-tango-images-tango-panic-gui/.release
@@ -1,2 +1,2 @@
-release=0.1.2
-tag=0.1.2
+release=0.1.3
+tag=0.1.3
diff --git a/images/ska-tango-images-tango-panic/.release b/images/ska-tango-images-tango-panic/.release
index 9e5e8dba767cdbc491e52e46ef8c6b9f06c15a86..ad405e826129d92a28ff1236f4a1253fb2615c9a 100644
--- a/images/ska-tango-images-tango-panic/.release
+++ b/images/ska-tango-images-tango-panic/.release
@@ -1,2 +1,2 @@
-release=0.1.1
-tag=0.1.1
+release=0.1.2
+tag=0.1.2
diff --git a/images/ska-tango-images-tango-pogo/.release b/images/ska-tango-images-tango-pogo/.release
index 6af734cc98b1524e88bbae3958bcda0cb2c9aa00..7fb6e935c4e971813f77d126d6e00da18e3c63cf 100644
--- a/images/ska-tango-images-tango-pogo/.release
+++ b/images/ska-tango-images-tango-pogo/.release
@@ -1,2 +1,2 @@
-release=9.6.34
-tag=9.6.34
+release=9.6.35
+tag=9.6.35
diff --git a/images/ska-tango-images-tango-pytango-alpine/.release b/images/ska-tango-images-tango-pytango-alpine/.release
index d893a903d5d559c64d46fdfa841c7a60be939cd2..ab56194b0accd9291353bf9870a347212f81d71b 100644
--- a/images/ska-tango-images-tango-pytango-alpine/.release
+++ b/images/ska-tango-images-tango-pytango-alpine/.release
@@ -1,2 +1,2 @@
-release=9.3.7
-tag=9.3.7
+release=9.3.8
+tag=9.3.8
diff --git a/images/ska-tango-images-tango-pytango/.release b/images/ska-tango-images-tango-pytango/.release
index d893a903d5d559c64d46fdfa841c7a60be939cd2..ab56194b0accd9291353bf9870a347212f81d71b 100644
--- a/images/ska-tango-images-tango-pytango/.release
+++ b/images/ska-tango-images-tango-pytango/.release
@@ -1,2 +1,2 @@
-release=9.3.7
-tag=9.3.7
+release=9.3.8
+tag=9.3.8
diff --git a/images/ska-tango-images-tango-rest-alpine/.release b/images/ska-tango-images-tango-rest-alpine/.release
index cbedebed7d19e6bf4e37934b5c47cde9fd5ca888..38bb82951a2bd271d903fa64cfe5dd580cde1d82 100644
--- a/images/ska-tango-images-tango-rest-alpine/.release
+++ b/images/ska-tango-images-tango-rest-alpine/.release
@@ -1,2 +1,2 @@
-release=1.14.6
-tag=1.14.6
+release=1.14.7
+tag=1.14.7
diff --git a/images/ska-tango-images-tango-rest/.release b/images/ska-tango-images-tango-rest/.release
index cbedebed7d19e6bf4e37934b5c47cde9fd5ca888..38bb82951a2bd271d903fa64cfe5dd580cde1d82 100644
--- a/images/ska-tango-images-tango-rest/.release
+++ b/images/ska-tango-images-tango-rest/.release
@@ -1,2 +1,2 @@
-release=1.14.6
-tag=1.14.6
+release=1.14.7
+tag=1.14.7
diff --git a/images/ska-tango-images-tango-test/.release b/images/ska-tango-images-tango-test/.release
index b5e144d37c5495ad9386636f83923706756abbe5..13f084b4d32138677ca2305a2c3855375c217b77 100644
--- a/images/ska-tango-images-tango-test/.release
+++ b/images/ska-tango-images-tango-test/.release
@@ -1,2 +1,2 @@
-release=3.0.5
-tag=3.0.5
+release=3.0.6
+tag=3.0.6
diff --git a/images/ska-tango-images-tango-vnc/.release b/images/ska-tango-images-tango-vnc/.release
index 4ee34bb43f8d39d1a1e0e7b4f5f2fe1c63182c5d..0468f411ad493a4a80c4dacf828ff9ba92f26254 100644
--- a/images/ska-tango-images-tango-vnc/.release
+++ b/images/ska-tango-images-tango-vnc/.release
@@ -1,2 +1,2 @@
-release=0.1.5
-tag=0.1.5
+release=0.1.6
+tag=0.1.6