Merge branch 'bug-fixing-for-ST-515-and-docker-images-creation' into 'master'

Resolve ST-515 "Bug fixing for  and docker images creation"

Closes ST-515

See merge request ska-telescope/ska-docker!44

charts/archiver/Chart.yaml

@@ -2,12 +2,12 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for deploying the HDB++ archiver for the MVP on Kubernetes
 name: archiver
-version: 0.2.4
+version: 0.2.5
 appVersion: 1.16.0
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-util
-  version: 0.2.2
+  version: 0.2.3
   repository: file://../tango-util
 # The archiver cannot have the tango-base since we allow only one level in the chart hierarchies
 # - name: tango-base

charts/ska-docker/Chart.yaml

@@ -2,14 +2,14 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: ska-docker
-version: 0.1.5
+version: 0.1.6
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-base
-  version: 0.2.5
+  version: 0.2.6
   repository: file://../tango-base
   condition: tango-base.enabled,global.sub-system.tango-base.enabled
 - name: archiver
-  version: 0.2.4
+  version: 0.2.5
   repository: file://../archiver
   condition: archiver.enabled,global.sub-system.archiver.enabled

charts/tango-base/Chart.yaml

@@ -2,9 +2,9 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: tango-base
-version: 0.2.5
+version: 0.2.6
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-util
-  version: 0.2.2
+  version: 0.2.3
   repository: file://../tango-util
\ No newline at end of file

charts/tango-util/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 description: A Helm chart library of utilities for TANGO deployents
 name: tango-util
 type: library
-appVersion: 0.2.2
-version: 0.2.2
+appVersion: 0.2.3
+version: 0.2.3
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 maintainers:
 - name: Matteo Di Carlo

charts/tango-util/templates/_deviceserver.yaml

@@ -13,11 +13,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{tpl (.deviceserver.name | toString) $chart }}
+  name: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
   namespace: {{ .local.Release.Namespace }}
   labels:
 {{ toYaml $labels | indent 4 }}
-    component: {{tpl (.deviceserver.name | toString) $chart }}
+    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
     function: {{ .deviceserver.function }}
     domain: {{ .deviceserver.domain }}
     subsystem: {{ .local.Values.subsystem }}
@@ -26,18 +26,18 @@ metadata:
 spec:
   selector:
     subsystem: {{ .local.Values.subsystem }}
-    component: {{tpl (.deviceserver.name | toString) $chart }}
+    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
   clusterIP: None
 
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{tpl (.deviceserver.name | toString) $chart }}
+  name: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
   namespace: {{ .local.Release.Namespace }}
   labels:
 {{ toYaml $labels | indent 4 }}
-    component: {{tpl (.deviceserver.name | toString) $chart }}
+    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
     function: {{ .deviceserver.function }}
     domain: {{ .deviceserver.domain }}
     subsystem: {{ .local.Values.subsystem }}
@@ -46,14 +46,14 @@ metadata:
 spec:
   selector:
     matchLabels:
-      component: {{tpl (.deviceserver.name | toString) $chart }}
+      component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
       subsystem: {{ .local.Values.subsystem }}
-  serviceName: {{tpl (.deviceserver.name | toString) $chart }}
+  serviceName: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
   replicas: 1
   template:
     metadata:
       labels:
-        component: {{tpl (.deviceserver.name | toString) $chart }}
+        component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
         function: {{ .deviceserver.function }}
         domain: {{ .deviceserver.domain }}
         subsystem: {{ .local.Values.subsystem }}
@@ -74,7 +74,7 @@ spec:
           - --timeout=60
           - --strict
           - --
-          - echo databaseds ready
+          - echo {{ $device.host }} ready
 {{- if ($chart.Values.global.environment_variables) }}
         env:
 {{- range $index, $envvar := $chart.Values.global.environment_variables }}

docker/tango/hdbpp_viewer/Dockerfile

 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
 
 USER root
 

docker/tango/mariadb_hdbpp/Dockerfile

 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-db:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-db:10.4.10
 
 COPY resources/create_hdb++_mysql.sql docker-entrypoint-initdb.d/create_db.sql
 COPY resources/my.cnf /etc/mysql/conf.d

docker/tango/ska-python-buildenv/Dockerfile

@@ -9,7 +9,7 @@
 #
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
 
 USER root
 

docker/tango/ska-python-runtime/Dockerfile

@@ -5,9 +5,9 @@
 #
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:latest as buildenv
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:9.3.2.1 as buildenv
 
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
 USER root
 
 # Permanently install Python and PyTango runtime dependencies:

docker/tango/tango-admin/Dockerfile

 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:9.3.4-rc7
 
 ENTRYPOINT ["/usr/local/bin/tango_admin"]
 

docker/tango/tango-archiver/Dockerfile

 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
 
 USER root
 

docker/tango/tango-cpp/Dockerfile

@@ -5,7 +5,7 @@
 #
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest as buildenv
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:9.3.3.1 as buildenv
 
 RUN TANGO_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/tango-cs/tango-9.3.4-rc7.tar.gz \
     # Speed up image builds by adding apt proxy if detected on host

docker/tango/tango-databaseds/Dockerfile

 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:9.3.4-rc7
 
 ENTRYPOINT ["/usr/local/bin/DataBaseds"]
 

docker/tango/tango-dependencies/.release

-release=9.3.3
-tag=tango-dependencies-9.3.3
+release=9.3.3.1
+tag=tango-dependencies-9.3.3.1

docker/tango/tango-dependencies/Dockerfile

@@ -41,7 +41,7 @@ RUN CPPZMQ_DOWNLOAD_URL=https://github.com/zeromq/cppzmq/archive/v4.4.1.tar.gz \
     && tar xf cppzmq.tar.gz -C /usr/src/cppzmq --strip-components=1 \
     && mkdir build \
     && cd build \
-    && cmake .. \
+    && cmake -DCPPZMQ_BUILD_TESTS=OFF .. \
     && make -j4 install \
     && apt-get purge -y --auto-remove $buildDeps \
     && rm -r /usr/src/cppzmq

docker/tango/tango-dsconfig/Dockerfile

 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
 
 USER root
 

docker/tango/tango-itango/Dockerfile

 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
 
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:latest as buildenv
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:9.3.2.1 as buildenv
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:9.3.2.1
 
 # create ipython profile to so that itango doesn't fail if ipython hasn't run yet
 

docker/tango/tango-java/Dockerfile

@@ -5,7 +5,7 @@
 #
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:9.3.3.1
 
 RUN JAVA_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/java/jre-8u221-linux-x64.tar.gz \
     && mkdir /usr/java \

docker/tango/tango-jive/Dockerfile

 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
 
 ENTRYPOINT ["/usr/local/bin/jive"]

docker/tango/tango-libtango/Dockerfile

 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7