From cb20843357b5e86d2c3e531e3552ca42f2ba321f Mon Sep 17 00:00:00 2001
From: Matteo Di Carlo <matteo.dicarlo@inaf.it>
Date: Thu, 22 Oct 2020 13:29:11 +0000
Subject: [PATCH] Resolve ST-515 "Bug fixing for and docker images creation"
---
charts/archiver/Chart.yaml | 4 ++--
charts/ska-docker/Chart.yaml | 6 +++---
charts/tango-base/Chart.yaml | 4 ++--
charts/tango-util/Chart.yaml | 4 ++--
charts/tango-util/templates/_deviceserver.yaml | 18 +++++++++---------
docker/tango/hdbpp_viewer/Dockerfile | 2 +-
docker/tango/mariadb_hdbpp/Dockerfile | 2 +-
docker/tango/ska-python-buildenv/Dockerfile | 2 +-
docker/tango/ska-python-runtime/Dockerfile | 4 ++--
docker/tango/tango-admin/Dockerfile | 2 +-
docker/tango/tango-archiver/Dockerfile | 2 +-
docker/tango/tango-cpp/Dockerfile | 2 +-
docker/tango/tango-databaseds/Dockerfile | 2 +-
docker/tango/tango-dependencies/.release | 4 ++--
docker/tango/tango-dependencies/Dockerfile | 2 +-
docker/tango/tango-dsconfig/Dockerfile | 2 +-
docker/tango/tango-itango/Dockerfile | 4 ++--
docker/tango/tango-java/Dockerfile | 2 +-
docker/tango/tango-jive/Dockerfile | 2 +-
docker/tango/tango-libtango/Dockerfile | 2 +-
docker/tango/tango-pogo/Dockerfile | 2 +-
docker/tango/tango-pytango/Dockerfile | 4 ++--
docker/tango/tango-rest/Dockerfile | 4 ++--
docker/tango/tango-starter/Dockerfile | 2 +-
docker/tango/tango-test/Dockerfile | 2 +-
docker/tango/tango-vnc/Dockerfile | 2 +-
docker/tango/tango-vscode/Dockerfile | 4 ++--
27 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/charts/archiver/Chart.yaml b/charts/archiver/Chart.yaml
index 766b84f8..141dda99 100644
--- a/charts/archiver/Chart.yaml
+++ b/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
diff --git a/charts/ska-docker/Chart.yaml b/charts/ska-docker/Chart.yaml
index c7111151..2eb249f6 100644
--- a/charts/ska-docker/Chart.yaml
+++ b/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
diff --git a/charts/tango-base/Chart.yaml b/charts/tango-base/Chart.yaml
index 0ad6daa3..808bb576 100644
--- a/charts/tango-base/Chart.yaml
+++ b/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
diff --git a/charts/tango-util/Chart.yaml b/charts/tango-util/Chart.yaml
index 41f80026..2a757c37 100644
--- a/charts/tango-util/Chart.yaml
+++ b/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
diff --git a/charts/tango-util/templates/_deviceserver.yaml b/charts/tango-util/templates/_deviceserver.yaml
index 938b2633..7005d069 100644
--- a/charts/tango-util/templates/_deviceserver.yaml
+++ b/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 }}
diff --git a/docker/tango/hdbpp_viewer/Dockerfile b/docker/tango/hdbpp_viewer/Dockerfile
index d007e8c5..f3e3262e 100644
--- a/docker/tango/hdbpp_viewer/Dockerfile
+++ b/docker/tango/hdbpp_viewer/Dockerfile
@@ -1,6 +1,6 @@
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
diff --git a/docker/tango/mariadb_hdbpp/Dockerfile b/docker/tango/mariadb_hdbpp/Dockerfile
index f3b652ec..e1bf7797 100644
--- a/docker/tango/mariadb_hdbpp/Dockerfile
+++ b/docker/tango/mariadb_hdbpp/Dockerfile
@@ -1,6 +1,6 @@
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
diff --git a/docker/tango/ska-python-buildenv/Dockerfile b/docker/tango/ska-python-buildenv/Dockerfile
index 71d06eb8..46b772a6 100644
--- a/docker/tango/ska-python-buildenv/Dockerfile
+++ b/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
diff --git a/docker/tango/ska-python-runtime/Dockerfile b/docker/tango/ska-python-runtime/Dockerfile
index dbc9186f..c2659647 100644
--- a/docker/tango/ska-python-runtime/Dockerfile
+++ b/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:
diff --git a/docker/tango/tango-admin/Dockerfile b/docker/tango/tango-admin/Dockerfile
index 493e7c1a..9482ce4e 100644
--- a/docker/tango/tango-admin/Dockerfile
+++ b/docker/tango/tango-admin/Dockerfile
@@ -1,6 +1,6 @@
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"]
diff --git a/docker/tango/tango-archiver/Dockerfile b/docker/tango/tango-archiver/Dockerfile
index 1a71c9a4..7e6e6349 100644
--- a/docker/tango/tango-archiver/Dockerfile
+++ b/docker/tango/tango-archiver/Dockerfile
@@ -1,6 +1,6 @@
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
diff --git a/docker/tango/tango-cpp/Dockerfile b/docker/tango/tango-cpp/Dockerfile
index ef07fc9c..b9afa2fa 100644
--- a/docker/tango/tango-cpp/Dockerfile
+++ b/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
diff --git a/docker/tango/tango-databaseds/Dockerfile b/docker/tango/tango-databaseds/Dockerfile
index c2473682..6bb975f9 100644
--- a/docker/tango/tango-databaseds/Dockerfile
+++ b/docker/tango/tango-databaseds/Dockerfile
@@ -1,6 +1,6 @@
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"]
diff --git a/docker/tango/tango-dependencies/.release b/docker/tango/tango-dependencies/.release
index af544554..69e50a37 100644
--- a/docker/tango/tango-dependencies/.release
+++ b/docker/tango/tango-dependencies/.release
@@ -1,2 +1,2 @@
-release=9.3.3
-tag=tango-dependencies-9.3.3
+release=9.3.3.1
+tag=tango-dependencies-9.3.3.1
diff --git a/docker/tango/tango-dependencies/Dockerfile b/docker/tango/tango-dependencies/Dockerfile
index 0acb2b70..4ee7851d 100644
--- a/docker/tango/tango-dependencies/Dockerfile
+++ b/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
diff --git a/docker/tango/tango-dsconfig/Dockerfile b/docker/tango/tango-dsconfig/Dockerfile
index f5479d16..43a75610 100644
--- a/docker/tango/tango-dsconfig/Dockerfile
+++ b/docker/tango/tango-dsconfig/Dockerfile
@@ -1,6 +1,6 @@
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
diff --git a/docker/tango/tango-itango/Dockerfile b/docker/tango/tango-itango/Dockerfile
index de855437..4a623e0f 100644
--- a/docker/tango/tango-itango/Dockerfile
+++ b/docker/tango/tango-itango/Dockerfile
@@ -1,8 +1,8 @@
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
diff --git a/docker/tango/tango-java/Dockerfile b/docker/tango/tango-java/Dockerfile
index 080a7eb9..1f1005a9 100644
--- a/docker/tango/tango-java/Dockerfile
+++ b/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 \
diff --git a/docker/tango/tango-jive/Dockerfile b/docker/tango/tango-jive/Dockerfile
index 14f2cb95..dd9ea0f0 100644
--- a/docker/tango/tango-jive/Dockerfile
+++ b/docker/tango/tango-jive/Dockerfile
@@ -1,5 +1,5 @@
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"]
diff --git a/docker/tango/tango-libtango/Dockerfile b/docker/tango/tango-libtango/Dockerfile
index b8e68fc5..bc2ac9ce 100644
--- a/docker/tango/tango-libtango/Dockerfile
+++ b/docker/tango/tango-libtango/Dockerfile
@@ -1,4 +1,4 @@
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
diff --git a/docker/tango/tango-pogo/Dockerfile b/docker/tango/tango-pogo/Dockerfile
index 268e6d9c..5f4b0b75 100644
--- a/docker/tango/tango-pogo/Dockerfile
+++ b/docker/tango/tango-pogo/Dockerfile
@@ -1,6 +1,6 @@
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
diff --git a/docker/tango/tango-pytango/Dockerfile b/docker/tango/tango-pytango/Dockerfile
index 48297be6..1ffc4f64 100644
--- a/docker/tango/tango-pytango/Dockerfile
+++ b/docker/tango/tango-pytango/Dockerfile
@@ -1,4 +1,4 @@
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
diff --git a/docker/tango/tango-rest/Dockerfile b/docker/tango/tango-rest/Dockerfile
index 5af7a3c9..7e4dbb5f 100644
--- a/docker/tango/tango-rest/Dockerfile
+++ b/docker/tango/tango-rest/Dockerfile
@@ -1,6 +1,6 @@
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 MTANGOREST_DOWNLOAD_URL=https://github.com/tango-controls/rest-server/releases/download/rest-server-1.14/rest-server-1.14.jar \
&& DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \
@@ -15,7 +15,7 @@ RUN MTANGOREST_DOWNLOAD_URL=https://github.com/tango-controls/rest-server/releas
&& curl -fsSL "$MTANGOREST_DOWNLOAD_URL" -o mtangorest.jar \
&& apt-get purge -y --auto-remove $buildDeps
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
COPY --from=buildenv /usr/local/lib/tango/mtangorest.jar /usr/local/lib/tango/mtangorest.jar
diff --git a/docker/tango/tango-starter/Dockerfile b/docker/tango/tango-starter/Dockerfile
index da182cdf..049fd699 100644
--- a/docker/tango/tango-starter/Dockerfile
+++ b/docker/tango/tango-starter/Dockerfile
@@ -1,6 +1,6 @@
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
diff --git a/docker/tango/tango-test/Dockerfile b/docker/tango/tango-test/Dockerfile
index 82846e61..cf4dfa2c 100644
--- a/docker/tango/tango-test/Dockerfile
+++ b/docker/tango/tango-test/Dockerfile
@@ -1,5 +1,5 @@
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/TangoTest"]
diff --git a/docker/tango/tango-vnc/Dockerfile b/docker/tango/tango-vnc/Dockerfile
index 95145e73..c0af0543 100644
--- a/docker/tango/tango-vnc/Dockerfile
+++ b/docker/tango/tango-vnc/Dockerfile
@@ -5,7 +5,7 @@
#
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
diff --git a/docker/tango/tango-vscode/Dockerfile b/docker/tango/tango-vscode/Dockerfile
index ff27ff75..663908f4 100644
--- a/docker/tango/tango-vscode/Dockerfile
+++ b/docker/tango/tango-vscode/Dockerfile
@@ -1,7 +1,7 @@
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
USER root
--
GitLab