diff --git a/.make b/.make
index aa07ec5c7d7f8805cc2369703e630b6d2230d536..3db25005b85fc0413cdb1eb3678997f816429f23 160000
--- a/.make
+++ b/.make
@@ -1 +1 @@
-Subproject commit aa07ec5c7d7f8805cc2369703e630b6d2230d536
+Subproject commit 3db25005b85fc0413cdb1eb3678997f816429f23
diff --git a/.release b/.release
index c00ac63de4835b47c1329bf26a188f989fa0dd11..f39244167920ce09a84e22c843ce805fd5da3404 100644
--- a/.release
+++ b/.release
@@ -1,2 +1,2 @@
-release=0.3.25
-tag=0.3.25
+release=0.3.26
+tag=0.3.26
diff --git a/charts/ska-tango-base/Chart.yaml b/charts/ska-tango-base/Chart.yaml
index 29df8ca0dbcb43978fc9321703069ae60d26adee..87652141a471581bf8157f0bab875665634419e4 100644
--- a/charts/ska-tango-base/Chart.yaml
+++ b/charts/ska-tango-base/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 0.3.23
description: A Helm chart for deploying the TANGO base system on Kubernetes
name: ska-tango-base
-version: 0.3.25
+version: 0.3.26
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies:
- name: ska-tango-util
diff --git a/charts/ska-tango-umbrella/Chart.yaml b/charts/ska-tango-umbrella/Chart.yaml
index 945d2502e2a7953199c63716b7dd23b0de488eed..3b464e622f54ac8539e22d5159be3ee46b23eaed 100644
--- a/charts/ska-tango-umbrella/Chart.yaml
+++ b/charts/ska-tango-umbrella/Chart.yaml
@@ -6,7 +6,7 @@ version: 0.2.6
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies:
- name: ska-tango-base
- version: 0.3.25
+ version: 0.3.26
repository: file://../ska-tango-base
condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled
- name: ska-tango-util
diff --git a/images/ska-tango-images-pytango-builder/.release b/images/ska-tango-images-pytango-builder/.release
index 96225e0dbf18d621a1442887de0dbf46812cb1a8..7df80144010542c33de154b1fab1f4c6c859e08e 100644
--- a/images/ska-tango-images-pytango-builder/.release
+++ b/images/ska-tango-images-pytango-builder/.release
@@ -1,3 +1,3 @@
-release=9.3.33
-tag=9.3.33
+release=9.3.34
+tag=9.3.34
diff --git a/images/ska-tango-images-pytango-builder/Dockerfile b/images/ska-tango-images-pytango-builder/Dockerfile
index ab956fc7f5c640715400dc315261c87430f13c94..6f2baa8001096959949a135edf5e4466423efe83 100644
--- a/images/ska-tango-images-pytango-builder/Dockerfile
+++ b/images/ska-tango-images-pytango-builder/Dockerfile
@@ -11,6 +11,7 @@ ARG CAR_PYPI_REPOSITORY_URL
ARG CAR_OCI_REGISTRY_HOST
ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-cpp:9.3.7"
FROM $BASE_IMAGE
+ARG DEBIAN_FRONTEND=noninteractive
LABEL \
author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
@@ -23,27 +24,25 @@ LABEL \
USER root
-
-
# Install build dependencies:
-#
# * build-essential installs C/C++ compilers and build tools
# * libboost-python-dev is required to bind PyTango to the C++ Tango libs
# * pkg-config is used to locate required libraries
# * git is required for Python packages using katversion for release info
-#
-RUN apt-get update \
- && apt-get -y install --no-install-recommends build-essential \
- libboost-python-dev \
- pkg-config \
- python3-distutils \
- python3-setuptools \
- python3-wheel \
- python3-venv \
- zlib1g-dev \
- ca-certificates \
- curl \
- git
+
+RUN apt-get update && \
+ apt-get install -y --no-install-recommends \
+ build-essential \
+ libboost-python-dev \
+ pkg-config \
+ python3-distutils \
+ python3-setuptools \
+ python3-wheel \
+ python3-venv \
+ zlib1g-dev \
+ ca-certificates \
+ curl \
+ git
RUN curl -k https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py
COPY pip.conf /etc/pip.conf
@@ -57,7 +56,5 @@ RUN python3 -m pip install --no-cache-dir numpy==1.23.0
# Install poetry as a binary
ENV POETRY_HOME=/opt/poetry
RUN curl -sSL https://install.python-poetry.org | python3 - --yes
-
RUN python3 -m pip install --no-cache-dir pytango==9.3.6
-
RUN ln -sfn /usr/bin/python3 /usr/bin/python && ln -sfn /opt/poetry/bin/poetry /usr/local/bin/poetry
diff --git a/images/ska-tango-images-pytango-runtime/.release b/images/ska-tango-images-pytango-runtime/.release
index 13401b3d29248b80a89299c121a0c0eadddc414a..e6cf944b9cec9b4824bbaf52f438bef968642574 100644
--- a/images/ska-tango-images-pytango-runtime/.release
+++ b/images/ska-tango-images-pytango-runtime/.release
@@ -1,2 +1,2 @@
-release=9.3.20
-tag=9.3.20
+release=9.3.21
+tag=9.3.21
diff --git a/images/ska-tango-images-pytango-runtime/Dockerfile b/images/ska-tango-images-pytango-runtime/Dockerfile
index ff750a3472257481f99bba726b0772c61faeb04f..8ed6d92d11ca1626b4a0abc5699dac5d8210bd78 100644
--- a/images/ska-tango-images-pytango-runtime/Dockerfile
+++ b/images/ska-tango-images-pytango-runtime/Dockerfile
@@ -10,6 +10,7 @@ ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-cpp:9.3.11"
FROM ${BUILD_IMAGE} as buildenv
FROM $BASE_IMAGE
+ARG DEBIAN_FRONTEND=noninteractive
LABEL \
author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
@@ -22,25 +23,22 @@ LABEL \
USER root
-
# Permanently install Python and PyTango runtime dependencies:
#
# * libboost-python is required by PyTango;
# * make is required to manage execution of the tests inside the container
# * python3 is required as this image is intended for running Python Tango
# devices.
-#
-
-RUN apt-get update \
- && apt-get -y install --no-install-recommends \
+RUN apt-get update && \
+ apt-get install -y --no-install-recommends \
libboost-python1.74.0 \
ca-certificates \
make \
curl \
python3 \
python3-distutils \
- python3-setuptools
-
+ python3-setuptools
+
# Copy across files that are used to help orchestrate container compositions
# and test execution sequences
COPY --from=buildenv /usr/local/bin/wait-for-it.sh /usr/local/bin/wait-for-it.sh
diff --git a/images/ska-tango-images-tango-admin/.release b/images/ska-tango-images-tango-admin/.release
index 368a43864f6c0ac2c7806ea115329776ff43e344..69a3fca90dd60fd66d06aba52592787d0972c248 100644
--- a/images/ska-tango-images-tango-admin/.release
+++ b/images/ska-tango-images-tango-admin/.release
@@ -1,2 +1,2 @@
-release=1.15.6
-tag=1.15.6
+release=1.15.7
+tag=1.15.7
diff --git a/images/ska-tango-images-tango-cpp/.release b/images/ska-tango-images-tango-cpp/.release
index a42c92a6840017f953f9e06a57d9483a66512f19..bbd9b14b61e40785fa14274fb13f00cb7cd50cd2 100644
--- a/images/ska-tango-images-tango-cpp/.release
+++ b/images/ska-tango-images-tango-cpp/.release
@@ -1,2 +1,2 @@
-release=9.3.12
-tag=9.3.12
+release=9.3.13
+tag=9.3.13
diff --git a/images/ska-tango-images-tango-cpp/Dockerfile b/images/ska-tango-images-tango-cpp/Dockerfile
index f6ca449d54dd6d37cfe62aeadd5de2da54407828..b25ff0bdcfbcb8af1b0dea69996aaaaab50a37ca 100644
--- a/images/ska-tango-images-tango-cpp/Dockerfile
+++ b/images/ska-tango-images-tango-cpp/Dockerfile
@@ -7,23 +7,26 @@ ARG CAR_OCI_REGISTRY_HOST
ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies:9.3.5"
ARG BASE_IMAGE="ubuntu:22.04"
FROM $BUILD_IMAGE as buildenv
-
-
+ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
- apt-get -y install --no-install-recommends \
- build-essential \
- ca-certificates \
- cmake \
- curl \
- file \
- git \
- libmariadbclient-dev-compat \
- pkg-config python3
-
+ apt-get install -y --no-install-recommends \
+ build-essential \
+ ca-certificates \
+ cmake \
+ curl \
+ file \
+ git \
+ libmariadbclient-dev-compat \
+ pkg-config \
+ python3 \
+ unattended-upgrades
+
+# Apply security upgrades (base image is not patched)
+RUN unattended-upgrade
+RUN apt-get purge unattended-upgrades -y
# build and install tangoidl
-
RUN mkdir -p /usr/src/idl
WORKDIR /usr/src/idl
@@ -39,11 +42,11 @@ RUN git clone https://gitlab.com/tango-controls/cppTango.git /usr/src/tango && \
cd /usr/src/tango && git checkout 9.3.5 && \
mkdir build && \
cmake . -B build \
- -DBUILD_TESTING=OFF \
- -DCPPZMQ_BASE=/usr/local/ \
- -DIDL_BASE=/usr/local/ \
- -DOMNI_BASE=/usr/local/ \
- -DZMQ_BASE=/usr/local/ && \
+ -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 && \
@@ -61,21 +64,23 @@ RUN git clone --depth 1 https://gitlab.com/tango-controls/TangoDatabase.git /usr
FROM $BASE_IMAGE
+ARG DEBIAN_FRONTEND=noninteractive
LABEL \
- author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
- description="This image includes the TANGO-controls framework with all its dependencies" \
- license="BSD-3-Clause" \
- registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-cpp" \
- org.skatelescope.team="Systems Team" \
- org.skatelescope.version="1.0.0" \
- int.skao.application="Tango CPP"
+ author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
+ description="This image includes the TANGO-controls framework with all its dependencies" \
+ license="BSD-3-Clause" \
+ registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-cpp" \
+ org.skatelescope.team="Systems Team" \
+ org.skatelescope.version="1.0.0" \
+ int.skao.application="Tango CPP"
COPY --from=buildenv /usr/local /usr/local
RUN apt-get update && \
- apt-get -y install --no-install-recommends \
- libmariadb3 sudo
+ apt-get install -y --no-install-recommends \
+ libmariadb3 \
+ sudo
RUN useradd --create-home --home-dir /home/tango tango
diff --git a/images/ska-tango-images-tango-databaseds/.release b/images/ska-tango-images-tango-databaseds/.release
index 9f15b5e340f051987f6df8694e78c75f849e956b..56e1f3621cce2bfa32363fde0a5e79641ee7a5df 100644
--- a/images/ska-tango-images-tango-databaseds/.release
+++ b/images/ska-tango-images-tango-databaseds/.release
@@ -1,2 +1,2 @@
-release=5.16.6
-tag=5.16.6
+release=5.16.7
+tag=5.16.7
diff --git a/images/ska-tango-images-tango-db/.release b/images/ska-tango-images-tango-db/.release
index 0df2aee5fd2cbc886142148e491ab254a67a8541..f2c01a561e1af8dc977fc38987fa6dcca7cb9500 100644
--- a/images/ska-tango-images-tango-db/.release
+++ b/images/ska-tango-images-tango-db/.release
@@ -1,2 +1,2 @@
-release=10.4.18
-tag=10.4.18
+release=10.4.19
+tag=10.4.19
diff --git a/images/ska-tango-images-tango-db/Dockerfile b/images/ska-tango-images-tango-db/Dockerfile
index 3c39d4c119118af0faa6efeff027db8cd53bdff1..9ebb44646dd417c7648ee2f029f44efeed361d9d 100644
--- a/images/ska-tango-images-tango-db/Dockerfile
+++ b/images/ska-tango-images-tango-db/Dockerfile
@@ -1,10 +1,18 @@
ARG BASE_IMAGE="mariadb:10.7.4-focal"
FROM $BASE_IMAGE AS builder
+ARG DEBIAN_FRONTEND=noninteractive
ENV TANGO_DOWNLOAD_URL=https://artefact.skao.int/repository/raw-internal/ska-tango-images/libraries/tango-9.3.4.tar.gz
RUN apt-get update && \
- apt-get -y install --no-install-recommends curl ca-certificates
+ apt-get install -y --no-install-recommends \
+ curl \
+ ca-certificates \
+ unattended-upgrades
+
+# Apply security upgrades (base image is not patched)
+RUN unattended-upgrade
+RUN apt-get purge unattended-upgrades -y
RUN mkdir -p /usr/src/tango
@@ -31,13 +39,13 @@ RUN rm -r /usr/src/tango
FROM $BASE_IMAGE
LABEL \
- author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
- description="This image is the tango db (MariaDB) from the TANGO-community" \
- license="BSD-3-Clause" \
- registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-db" \
- org.skatelescope.team="Systems Team" \
- org.skatelescope.version="1.0.0" \
- int.skao.application="Tango DB"
+ author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
+ description="This image is the tango db (MariaDB) from the TANGO-community" \
+ license="BSD-3-Clause" \
+ registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-db" \
+ org.skatelescope.team="Systems Team" \
+ org.skatelescope.version="1.0.0" \
+ int.skao.application="Tango DB"
COPY --from=builder /docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
COPY sql_mode.cnf /etc/mysql/conf.d
diff --git a/images/ska-tango-images-tango-dependencies/.release b/images/ska-tango-images-tango-dependencies/.release
index 3253cc9b33c21276fcff189d9d491811ca998623..a42c92a6840017f953f9e06a57d9483a66512f19 100644
--- a/images/ska-tango-images-tango-dependencies/.release
+++ b/images/ska-tango-images-tango-dependencies/.release
@@ -1,2 +1,2 @@
-release=9.3.11
-tag=9.3.11
+release=9.3.12
+tag=9.3.12
diff --git a/images/ska-tango-images-tango-dependencies/Dockerfile b/images/ska-tango-images-tango-dependencies/Dockerfile
index 3222b8ebd8c27ccff0e0613ce15f76073328d74f..0314e341b8b3708e1df660ef9956a760bdc4fbdc 100644
--- a/images/ska-tango-images-tango-dependencies/Dockerfile
+++ b/images/ska-tango-images-tango-dependencies/Dockerfile
@@ -5,6 +5,7 @@
#
ARG BASE_IMAGE="ubuntu:22.04"
FROM $BASE_IMAGE as buildenv
+ARG DEBIAN_FRONTEND=noninteractive
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
@@ -16,10 +17,24 @@ COPY wait-for-it.sh /usr/local/bin/wait-for-it.sh
COPY retry.sh /usr/local/bin/retry
RUN apt-get update && \
- apt-get -y install --no-install-recommends \
- autoconf automake build-essential ca-certificates \
- curl libkrb5-dev libtool pkg-config unzip \
- cmake python3-dev python3-pkgconfig
+ apt-get install -y --no-install-recommends \
+ autoconf \
+ automake \
+ build-essential \
+ ca-certificates \
+ curl \
+ libkrb5-dev \
+ libtool \
+ pkg-config \
+ unzip \
+ cmake \
+ python3-dev \
+ python3-pkgconfig \
+ unattended-upgrades
+
+# Apply security upgrades (base image)
+RUN unattended-upgrade
+RUN apt-get purge unattended-upgrades -y
RUN mkdir /usr/src/zeromq
WORKDIR /usr/src/zeromq
@@ -55,12 +70,12 @@ RUN curl -kfsSL "$OMNIORB_DOWNLOAD_URL" -o omniorb.tar.bz2 \
FROM $BASE_IMAGE
LABEL \
- author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
- description="This image includes all the depenencies needed for installing the TANGO-controls framework" \
- license="BSD-3-Clause" \
- registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies" \
- org.skatelescope.team="Systems Team" \
- org.skatelescope.version="1.0.0" \
- int.skao.application="Tango dependencies"
+ author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
+ description="This image includes all the depenencies needed for installing the TANGO-controls framework" \
+ license="BSD-3-Clause" \
+ registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies" \
+ org.skatelescope.team="Systems Team" \
+ org.skatelescope.version="1.0.0" \
+ int.skao.application="Tango dependencies"
COPY --from=buildenv /usr/local /usr/local
diff --git a/images/ska-tango-images-tango-dsconfig/.release b/images/ska-tango-images-tango-dsconfig/.release
index 9b3d30688de80115532fad51e9aeb382ece2a452..20b4a27d713e36d94715358d5ed154d27422842d 100644
--- a/images/ska-tango-images-tango-dsconfig/.release
+++ b/images/ska-tango-images-tango-dsconfig/.release
@@ -1,2 +1,2 @@
-release=1.5.8
-tag=1.5.8
+release=1.5.9
+tag=1.5.9
diff --git a/images/ska-tango-images-tango-itango/.release b/images/ska-tango-images-tango-itango/.release
index 3253cc9b33c21276fcff189d9d491811ca998623..a42c92a6840017f953f9e06a57d9483a66512f19 100644
--- a/images/ska-tango-images-tango-itango/.release
+++ b/images/ska-tango-images-tango-itango/.release
@@ -1,2 +1,2 @@
-release=9.3.11
-tag=9.3.11
+release=9.3.12
+tag=9.3.12
diff --git a/images/ska-tango-images-tango-itango/Dockerfile b/images/ska-tango-images-tango-itango/Dockerfile
index 749a998735887eaa0efb941ddc273d25733c7761..19c159dd2ab7b3f6b005491028d23b9b30194380 100644
--- a/images/ska-tango-images-tango-itango/Dockerfile
+++ b/images/ska-tango-images-tango-itango/Dockerfile
@@ -4,6 +4,7 @@ ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-pytango-runtime:9.3.12
FROM $BUILD_IMAGE as buildenv
FROM $BASE_IMAGE
+ARG DEBIAN_FRONTEND=noninteractive
LABEL \
author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
@@ -15,7 +16,9 @@ LABEL \
int.skao.application="ITango"
USER root
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y procps
+RUN apt-get update && \
+ apt-get install -y --no-install-recommends \
+ procps
USER tango
diff --git a/images/ska-tango-images-tango-java/.release b/images/ska-tango-images-tango-java/.release
index ab56194b0accd9291353bf9870a347212f81d71b..27baa2de2998ca965f64f84bfe9cfd3a2d14b271 100644
--- a/images/ska-tango-images-tango-java/.release
+++ b/images/ska-tango-images-tango-java/.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-java/Dockerfile b/images/ska-tango-images-tango-java/Dockerfile
index 2b296821c2aa94829b2de7049d32b5f799831b8a..7a729b3896f0410cefaf804f5c78030a394493d9 100644
--- a/images/ska-tango-images-tango-java/Dockerfile
+++ b/images/ska-tango-images-tango-java/Dockerfile
@@ -6,25 +6,35 @@
ARG CAR_OCI_REGISTRY_HOST
ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies:9.3.5"
FROM $BUILD_IMAGE
+ARG DEBIAN_FRONTEND=noninteractive
LABEL \
- author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
- description="This image includes the Java GUI applications of the TANGO-controls framework" \
- license="BSD-3-Clause" \
- registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-java" \
- org.skatelescope.team="Systems Team" \
- org.skatelescope.version="1.0.0" \
- int.skao.application="Tango Java"
+ author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
+ description="This image includes the Java GUI applications of the TANGO-controls framework" \
+ license="BSD-3-Clause" \
+ registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-java" \
+ org.skatelescope.team="Systems Team" \
+ org.skatelescope.version="1.0.0" \
+ int.skao.application="Tango Java"
ENV JAVA_DOWNLOAD_URL=https://artefact.skao.int/repository/raw-internal/ska-tango-images/libraries/jre-8u221-linux-x64.tar.gz
ENV TANGO_DOWNLOAD_URL=https://artefact.skao.int/repository/raw-internal/ska-tango-images/libraries/tango-9.3.4.tar.gz
ENV LOG4J=https://artefact.skao.int/repository/raw-internal/ska-tango-images/libraries/log4j-1.2.17.tar.gz
-
RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
- wget sudo libxrender1 libxtst6 libxi6 \
- build-essential curl file libmariadbclient-dev-compat pkg-config libmariadb3 python3
+ apt-get install -y --no-install-recommends \
+ wget \
+ sudo \
+ libxrender1 \
+ libxtst6 \
+ libxi6 \
+ build-essential \
+ curl \
+ file \
+ libmariadbclient-dev-compat \
+ pkg-config \
+ libmariadb3 \
+ python3
RUN mkdir /usr/java
WORKDIR /usr/java
diff --git a/images/ska-tango-images-tango-jive/.release b/images/ska-tango-images-tango-jive/.release
index 31006f9fc49ff7098cab27750f1803d13f132858..f70442e121c50915a2983505fed0c9f5d0b8eefa 100644
--- a/images/ska-tango-images-tango-jive/.release
+++ b/images/ska-tango-images-tango-jive/.release
@@ -1,2 +1,2 @@
-release=7.22.5
-tag=7.22.5
+release=7.22.6
+tag=7.22.6
diff --git a/images/ska-tango-images-tango-libtango/.release b/images/ska-tango-images-tango-libtango/.release
index 27baa2de2998ca965f64f84bfe9cfd3a2d14b271..31adb7e2589cb095d6c86aee57ada1fc28bdade0 100644
--- a/images/ska-tango-images-tango-libtango/.release
+++ b/images/ska-tango-images-tango-libtango/.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-panic-gui/.release b/images/ska-tango-images-tango-panic-gui/.release
index d7b12ab0df0211c23a0c8af543ab22d7326036c5..8563f376e22d485c0f5ca0de90046fbcc37b5f8d 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.3
-tag=0.1.3
+release=0.1.4
+tag=0.1.4
diff --git a/images/ska-tango-images-tango-panic-gui/Dockerfile b/images/ska-tango-images-tango-panic-gui/Dockerfile
index 5286ebdb5e15e720fe387a6e9b8a4c0ca05fb166..7fc3b4c4b45495b4b12557000a63b3d07193a70f 100644
--- a/images/ska-tango-images-tango-panic-gui/Dockerfile
+++ b/images/ska-tango-images-tango-panic-gui/Dockerfile
@@ -1,15 +1,16 @@
ARG CAR_OCI_REGISTRY_HOST
ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-pytango-builder:9.3.6"
FROM $BASE_IMAGE
+ARG DEBIAN_FRONTEND=noninteractive
LABEL \
- author="Andrew Bolin <andrew.bolin@csiro.au>, Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
- description="This image is the Panic GUI application available from the TANGO-community" \
- license="BSD-3-Clause" \
- registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-panic-gui" \
- org.skatelescope.team="Systems Team" \
- org.skatelescope.version="1.0.0" \
- int.skao.application="Tango Panic GUI"
+ author="Andrew Bolin <andrew.bolin@csiro.au>, Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
+ description="This image is the Panic GUI application available from the TANGO-community" \
+ license="BSD-3-Clause" \
+ registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-panic-gui" \
+ org.skatelescope.team="Systems Team" \
+ org.skatelescope.version="1.0.0" \
+ int.skao.application="Tango Panic GUI"
# # # NOTES
# - pip2 crashes if the package we want isn't in the SKA repo,
@@ -24,8 +25,8 @@ LABEL \
RUN mv /etc/pip.conf /tmp/ska_pip_conf
-RUN apt-get update && \
- apt-get -y install python2.7
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ python2.7
RUN ln -s /usr/lib/x86_64-linux-gnu/libboost_python27.so /usr/lib/x86_64-linux-gnu/libboost_python-py27.so && \
pip install panic lxml
@@ -38,47 +39,48 @@ ENV DISPLAY=:20
USER root
-RUN apt-get update && apt-mark hold iptables && \
- DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- dbus-x11 \
- psmisc \
- xdg-utils \
- x11-xserver-utils \
- x11-utils \
- xfce4 \
- gtk3-engines-unico \
- libgtk-3-bin \
- mousepad \
- xfce4-notifyd \
- xfce4-taskmanager \
- xfce4-terminal \
- xfce4-battery-plugin \
- xfce4-clipman-plugin \
- xfce4-cpufreq-plugin \
- xfce4-cpugraph-plugin \
- xfce4-diskperf-plugin \
- xfce4-datetime-plugin \
- xfce4-fsguard-plugin \
- xfce4-genmon-plugin \
- xfce4-indicator-plugin \
- xfce4-netload-plugin \
- xfce4-notes-plugin \
- xfce4-places-plugin \
- xfce4-sensors-plugin \
- xfce4-smartbookmark-plugin \
- xfce4-systemload-plugin \
- xfce4-timer-plugin \
- xfce4-verve-plugin \
- xfce4-weather-plugin \
- xfce4-whiskermenu-plugin \
- libxv1 \
- mesa-utils \
- mesa-utils-extra
+RUN apt-get update && \
+ apt-mark hold iptables && \
+ apt-get install -y --no-install-recommends \
+ dbus-x11 \
+ psmisc \
+ xdg-utils \
+ x11-xserver-utils \
+ x11-utils \
+ xfce4 \
+ gtk3-engines-unico \
+ libgtk-3-bin \
+ mousepad \
+ xfce4-notifyd \
+ xfce4-taskmanager \
+ xfce4-terminal \
+ xfce4-battery-plugin \
+ xfce4-clipman-plugin \
+ xfce4-cpufreq-plugin \
+ xfce4-cpugraph-plugin \
+ xfce4-diskperf-plugin \
+ xfce4-datetime-plugin \
+ xfce4-fsguard-plugin \
+ xfce4-genmon-plugin \
+ xfce4-indicator-plugin \
+ xfce4-netload-plugin \
+ xfce4-notes-plugin \
+ xfce4-places-plugin \
+ xfce4-sensors-plugin \
+ xfce4-smartbookmark-plugin \
+ xfce4-systemload-plugin \
+ xfce4-timer-plugin \
+ xfce4-verve-plugin \
+ xfce4-weather-plugin \
+ xfce4-whiskermenu-plugin \
+ libxv1 \
+ mesa-utils \
+ mesa-utils-extra
RUN sed -i 's%<property name="ThemeName" type="string" value="Xfce"/>%<property name="ThemeName" type="string" value="Raleigh"/>%' /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ apt-get install -y --no-install-recommends \
git \
x11vnc \
software-properties-common \
diff --git a/images/ska-tango-images-tango-panic/.release b/images/ska-tango-images-tango-panic/.release
index ad405e826129d92a28ff1236f4a1253fb2615c9a..d7b12ab0df0211c23a0c8af543ab22d7326036c5 100644
--- a/images/ska-tango-images-tango-panic/.release
+++ b/images/ska-tango-images-tango-panic/.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/Dockerfile b/images/ska-tango-images-tango-panic/Dockerfile
index f170e7b5d3e045d2f87203ca48dfe7e343284492..34c364d1bbda670f876e135bde99bf8de2e92191 100644
--- a/images/ska-tango-images-tango-panic/Dockerfile
+++ b/images/ska-tango-images-tango-panic/Dockerfile
@@ -1,15 +1,16 @@
ARG CAR_OCI_REGISTRY_HOST
ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-pytango-builder:9.3.6"
FROM $BASE_IMAGE
+ARG DEBIAN_FRONTEND=noninteractive
LABEL \
- author="Andrew Bolin <andrew.bolin@csiro.au>, Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
- description="This image is the Panic application available from the TANGO-community" \
- license="BSD-3-Clause" \
- registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-panic" \
- org.skatelescope.team="Systems Team" \
- org.skatelescope.version="1.0.0" \
- int.skao.application="Tango Panic"
+ author="Andrew Bolin <andrew.bolin@csiro.au>, Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
+ description="This image is the Panic application available from the TANGO-community" \
+ license="BSD-3-Clause" \
+ registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-panic" \
+ org.skatelescope.team="Systems Team" \
+ org.skatelescope.version="1.0.0" \
+ int.skao.application="Tango Panic"
# # # NOTES
# - pip2 crashes if the package we want isn't in the SKA repo,
@@ -20,15 +21,15 @@ LABEL \
# - panic uses python 2, but 'python' maps to python3 in our base image,
# so we use sed to edit the PyAlarm launcher
-
USER root
RUN mv /etc/pip.conf /tmp/ska_pip_conf
RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get -y install python2.7 \
- python-pip \
- exim4
+ apt-get install -y --no-install-recommends \
+ python2.7 \
+ python-pip \
+ exim4
RUN ln -s /usr/lib/x86_64-linux-gnu/libboost_python27.so /usr/lib/x86_64-linux-gnu/libboost_python-py27.so && \
pip install panic
diff --git a/images/ska-tango-images-tango-pogo/.release b/images/ska-tango-images-tango-pogo/.release
index 7fb6e935c4e971813f77d126d6e00da18e3c63cf..586deb79d51f69bce456345148060c08d538b204 100644
--- a/images/ska-tango-images-tango-pogo/.release
+++ b/images/ska-tango-images-tango-pogo/.release
@@ -1,2 +1,2 @@
-release=9.6.35
-tag=9.6.35
+release=9.6.36
+tag=9.6.36
diff --git a/images/ska-tango-images-tango-pogo/Dockerfile b/images/ska-tango-images-tango-pogo/Dockerfile
index 757cab3f18ebc04adb858effb45d89c82f3f5881..bd1115b5915829c98363c301711eda77f06743d4 100644
--- a/images/ska-tango-images-tango-pogo/Dockerfile
+++ b/images/ska-tango-images-tango-pogo/Dockerfile
@@ -3,28 +3,23 @@ ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-java:9.3.5"
FROM $BASE_IMAGE
LABEL \
- author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
- description="This image is the Pogo application available from the TANGO-community" \
- license="BSD-3-Clause" \
- registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-pogo" \
- org.skatelescope.team="Systems Team" \
- org.skatelescope.version="1.0.0" \
- int.skao.application="Tango Pogo"
+ author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
+ description="This image is the Pogo application available from the TANGO-community" \
+ license="BSD-3-Clause" \
+ registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-pogo" \
+ org.skatelescope.team="Systems Team" \
+ org.skatelescope.version="1.0.0" \
+ int.skao.application="Tango Pogo"
USER root
-
-
ENV POGO_DOWNLOAD_URL=https://artefact.skao.int/repository/raw-internal/ska-tango-images/libraries/Pogo-9.6.31.jar
-RUN apt-get update && \
- apt-get -y install wget
-
WORKDIR /usr/local/share/java
# Pogo is included in tango source distribution, but replace with a newer version
# Official source: https://bintray.com/tango-controls/maven/Pogo/_latestVersion
-RUN wget --no-check-certificate "$POGO_DOWNLOAD_URL" -O Pogo-9.6.31.jar \
+RUN curl -k "$POGO_DOWNLOAD_URL" -o Pogo-9.6.31.jar \
&& ln -sf Pogo-9.6.31.jar Pogo.jar
USER tango
diff --git a/images/ska-tango-images-tango-pytango/.release b/images/ska-tango-images-tango-pytango/.release
index 31adb7e2589cb095d6c86aee57ada1fc28bdade0..3253cc9b33c21276fcff189d9d491811ca998623 100644
--- a/images/ska-tango-images-tango-pytango/.release
+++ b/images/ska-tango-images-tango-pytango/.release
@@ -1,2 +1,2 @@
-release=9.3.10
-tag=9.3.10
+release=9.3.11
+tag=9.3.11
diff --git a/images/ska-tango-images-tango-rest/.release b/images/ska-tango-images-tango-rest/.release
index 38bb82951a2bd271d903fa64cfe5dd580cde1d82..b1a1c07a0b0a192d6e0126d63779f2cd23aa412d 100644
--- a/images/ska-tango-images-tango-rest/.release
+++ b/images/ska-tango-images-tango-rest/.release
@@ -1,2 +1,2 @@
-release=1.14.7
-tag=1.14.7
+release=1.14.8
+tag=1.14.8
diff --git a/images/ska-tango-images-tango-rest/Dockerfile b/images/ska-tango-images-tango-rest/Dockerfile
index 46fe7a5cb092ff21d83cbca83e2f7cb99e12ee0a..f4768f42e3b58e86a601b2bdbecea507c74884b1 100644
--- a/images/ska-tango-images-tango-rest/Dockerfile
+++ b/images/ska-tango-images-tango-rest/Dockerfile
@@ -3,11 +3,15 @@ ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies:9.
ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-java:9.3.5"
FROM $BUILD_IMAGE AS buildenv
+ARG DEBIAN_FRONTEND=noninteractive
ENV MTANGOREST_DOWNLOAD_URL=https://github.com/tango-controls/rest-server/releases/download/rest-server-1.14/rest-server-1.14.jar
RUN apt-get update && \
- apt-get -y install ca-certificates curl libtcnative-1 --no-install-recommends
+ apt-get install -y --no-install-recommends \
+ ca-certificates \
+ curl \
+ libtcnative-1
RUN mkdir -p /usr/local/lib/tango
@@ -16,15 +20,16 @@ WORKDIR /usr/local/lib/tango
RUN curl -fsSL "$MTANGOREST_DOWNLOAD_URL" -o mtangorest.jar
FROM $BASE_IMAGE
+ARG DEBIAN_FRONTEND=noninteractive
LABEL \
- author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
- description="This image is the tango-rest application available from the TANGO-community" \
- license="BSD-3-Clause" \
- registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-rest" \
- org.skatelescope.team="Systems Team" \
- org.skatelescope.version="1.0.0" \
- int.skao.application="Tango REST"
+ author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
+ description="This image is the tango-rest application available from the TANGO-community" \
+ license="BSD-3-Clause" \
+ registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-rest" \
+ org.skatelescope.team="Systems Team" \
+ org.skatelescope.version="1.0.0" \
+ int.skao.application="Tango REST"
COPY --from=buildenv /usr/local/lib/tango/mtangorest.jar /usr/local/lib/tango/mtangorest.jar
@@ -33,7 +38,9 @@ USER root
RUN mkdir -p /usr/share/man/man1
RUN apt-get update && \
- apt-get -y install supervisor libtcnative-1 --no-install-recommends
+ apt-get install -y --no-install-recommends \
+ supervisor \
+ libtcnative-1
RUN ln -s /usr/lib/x86_64-linux-gnu/libtcnative-1.so /usr/lib/libtcnative-1.so
diff --git a/images/ska-tango-images-tango-test/.release b/images/ska-tango-images-tango-test/.release
index 13f084b4d32138677ca2305a2c3855375c217b77..4f35adcaf804809a94af2bbe03e0e2ed7a73db91 100644
--- a/images/ska-tango-images-tango-test/.release
+++ b/images/ska-tango-images-tango-test/.release
@@ -1,2 +1,2 @@
-release=3.0.6
-tag=3.0.6
+release=3.0.7
+tag=3.0.7
diff --git a/images/ska-tango-images-tango-vnc/.release b/images/ska-tango-images-tango-vnc/.release
index c3a409dd08c6c62d48ad8f58d3c863a75bce6337..2992c04e0f4d4527c5ba93bacc4d7b19e0d15d9c 100644
--- a/images/ska-tango-images-tango-vnc/.release
+++ b/images/ska-tango-images-tango-vnc/.release
@@ -1,2 +1,2 @@
-release=0.1.7
-tag=0.1.7
+release=0.1.8
+tag=0.1.8
diff --git a/images/ska-tango-images-tango-vnc/Dockerfile b/images/ska-tango-images-tango-vnc/Dockerfile
index 98fa5275414f2ee1c89134509852f7b017216fb6..1c3a06e91f90b308d9c63b9d97bc86dcc3ab6315 100644
--- a/images/ska-tango-images-tango-vnc/Dockerfile
+++ b/images/ska-tango-images-tango-vnc/Dockerfile
@@ -6,61 +6,64 @@
ARG CAR_OCI_REGISTRY_HOST
ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-java:9.3.5"
FROM $BASE_IMAGE
+ARG DEBIAN_FRONTEND=noninteractive
LABEL \
- author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
- description="This image includes the Java GUI applications of the TANGO-controls framework and a X11 server with VNC and NoVnc installed" \
- license="BSD-3-Clause" \
- registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-vnc" \
- org.skatelescope.team="Systems Team" \
- org.skatelescope.version="1.0.0" \
- int.skao.application="Tango VNC"
+ author="Matteo Di Carlo <matteo.dicarlo@inaf.it>" \
+ description="This image includes the Java GUI applications of the TANGO-controls framework and a X11 server with VNC and NoVnc installed" \
+ license="BSD-3-Clause" \
+ registry="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-vnc" \
+ org.skatelescope.team="Systems Team" \
+ org.skatelescope.version="1.0.0" \
+ int.skao.application="Tango VNC"
ENV DISPLAY=:20
USER root
-RUN apt-get update && apt-mark hold iptables && \
+RUN apt-get update && \
+ apt-mark hold iptables && \
apt-get install -y --no-install-recommends \
- dbus-x11 \
- psmisc \
- xdg-utils \
- x11-xserver-utils \
- x11-utils \
- xfce4 \
- gtk3-engines-unico \
- libgtk-3-bin \
- mousepad \
- xfce4-notifyd \
- xfce4-taskmanager \
- xfce4-terminal \
- xfce4-battery-plugin \
- xfce4-clipman-plugin \
- xfce4-cpufreq-plugin \
- xfce4-cpugraph-plugin \
- xfce4-diskperf-plugin \
- xfce4-datetime-plugin \
- xfce4-fsguard-plugin \
- xfce4-genmon-plugin \
- xfce4-indicator-plugin \
- xfce4-netload-plugin \
- xfce4-notes-plugin \
- xfce4-places-plugin \
- xfce4-sensors-plugin \
- xfce4-smartbookmark-plugin \
- xfce4-systemload-plugin \
- xfce4-timer-plugin \
- xfce4-verve-plugin \
- xfce4-weather-plugin \
- xfce4-whiskermenu-plugin \
- libxv1 \
- mesa-utils \
- mesa-utils-extra
+ dbus-x11 \
+ psmisc \
+ xdg-utils \
+ x11-xserver-utils \
+ x11-utils \
+ xfce4 \
+ gtk3-engines-unico \
+ libgtk-3-bin \
+ mousepad \
+ xfce4-notifyd \
+ xfce4-taskmanager \
+ xfce4-terminal \
+ xfce4-battery-plugin \
+ xfce4-clipman-plugin \
+ xfce4-cpufreq-plugin \
+ xfce4-cpugraph-plugin \
+ xfce4-diskperf-plugin \
+ xfce4-datetime-plugin \
+ xfce4-fsguard-plugin \
+ xfce4-genmon-plugin \
+ xfce4-indicator-plugin \
+ xfce4-netload-plugin \
+ xfce4-notes-plugin \
+ xfce4-places-plugin \
+ xfce4-sensors-plugin \
+ xfce4-smartbookmark-plugin \
+ xfce4-systemload-plugin \
+ xfce4-timer-plugin \
+ xfce4-verve-plugin \
+ xfce4-weather-plugin \
+ xfce4-whiskermenu-plugin \
+ libxv1 \
+ mesa-utils \
+ mesa-utils-extra
RUN sed -i 's%<property name="ThemeName" type="string" value="Xfce"/>%<property name="ThemeName" type="string" value="Raleigh"/>%' /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+RUN apt-get update && \
+ apt-get -y install --no-install-recommends \
git \
x11vnc \
software-properties-common \