From bdbc1138c85722815c5d14c494ef98340b5a7d70 Mon Sep 17 00:00:00 2001
From: "J. Bruno Morgado" <jb.morgado@gmail.com>
Date: Mon, 21 Nov 2022 14:16:40 +0000
Subject: [PATCH] ST-1388: Change startegy for removing unattended upgrades
 package after run (instead of mitigating poetry bug)

---
 images/ska-tango-images-pytango-builder/Dockerfile    | 3 ---
 images/ska-tango-images-tango-cpp/Dockerfile          | 1 +
 images/ska-tango-images-tango-db/Dockerfile           | 1 +
 images/ska-tango-images-tango-dependencies/Dockerfile | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/images/ska-tango-images-pytango-builder/Dockerfile b/images/ska-tango-images-pytango-builder/Dockerfile
index 84bef05e..6f2baa80 100644
--- a/images/ska-tango-images-pytango-builder/Dockerfile
+++ b/images/ska-tango-images-pytango-builder/Dockerfile
@@ -47,9 +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
 
-# Workaround for poetry intended bug: https://github.com/python-poetry/poetry/issues/6013
-RUN pip install distro-info==1.0
-
 WORKDIR /app
 
 # Install numpy manually before PyTango and other requirements to ensure we
diff --git a/images/ska-tango-images-tango-cpp/Dockerfile b/images/ska-tango-images-tango-cpp/Dockerfile
index 3eca01a3..b25ff0bd 100644
--- a/images/ska-tango-images-tango-cpp/Dockerfile
+++ b/images/ska-tango-images-tango-cpp/Dockerfile
@@ -24,6 +24,7 @@ RUN apt-get update && \
 
 # 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
diff --git a/images/ska-tango-images-tango-db/Dockerfile b/images/ska-tango-images-tango-db/Dockerfile
index f167610d..9ebb4464 100644
--- a/images/ska-tango-images-tango-db/Dockerfile
+++ b/images/ska-tango-images-tango-db/Dockerfile
@@ -12,6 +12,7 @@ RUN apt-get update && \
 
 # Apply security upgrades (base image is not patched)
 RUN unattended-upgrade
+RUN apt-get purge unattended-upgrades -y
 
 RUN mkdir -p /usr/src/tango
 
diff --git a/images/ska-tango-images-tango-dependencies/Dockerfile b/images/ska-tango-images-tango-dependencies/Dockerfile
index b086644f..0314e341 100644
--- a/images/ska-tango-images-tango-dependencies/Dockerfile
+++ b/images/ska-tango-images-tango-dependencies/Dockerfile
@@ -34,6 +34,7 @@ RUN apt-get update && \
 
 # Apply security upgrades (base image)
 RUN unattended-upgrade
+RUN apt-get purge unattended-upgrades -y
 
 RUN mkdir /usr/src/zeromq
 WORKDIR /usr/src/zeromq
-- 
GitLab