From a167d8e3aab83a6aeca1fdfc720a8aaa8f092a12 Mon Sep 17 00:00:00 2001
From: Ugur Yilmaz <ugur.yilmaz@skao.int>
Date: Tue, 27 Sep 2022 14:09:49 +0100
Subject: [PATCH] ST-1398: Fix PATH for itango
---
images/ska-tango-images-pytango-runtime/Dockerfile | 2 +-
images/ska-tango-images-tango-itango/Dockerfile | 2 --
images/ska-tango-images-tango-vnc/Dockerfile | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/images/ska-tango-images-pytango-runtime/Dockerfile b/images/ska-tango-images-pytango-runtime/Dockerfile
index 0240944d..ff750a34 100644
--- a/images/ska-tango-images-pytango-runtime/Dockerfile
+++ b/images/ska-tango-images-pytango-runtime/Dockerfile
@@ -54,7 +54,7 @@ COPY pip.conf /etc/pip.conf
RUN ln -sfn /usr/bin/python3 /usr/bin/python && ln -sfn /opt/poetry/bin/poetry /usr/local/bin/poetry
USER tango
-ENV PATH="home/tango/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}"
+ENV PATH="/home/tango/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}"
ONBUILD COPY --chown=tango:tango . /app
ONBUILD COPY --from=buildenv /usr/local/bin/ /usr/local/bin/
diff --git a/images/ska-tango-images-tango-itango/Dockerfile b/images/ska-tango-images-tango-itango/Dockerfile
index 2428d2f9..749a9987 100644
--- a/images/ska-tango-images-tango-itango/Dockerfile
+++ b/images/ska-tango-images-tango-itango/Dockerfile
@@ -23,6 +23,4 @@ RUN python3 -m pip install --no-cache-dir ipython==8.5.0 itango==0.1.9
# create ipython profile to so that itango doesn't fail if ipython hasn't run yet
RUN ipython profile create
-RUN python3 -m pip install -r /requirements.txt
-
CMD ["itango3"]
diff --git a/images/ska-tango-images-tango-vnc/Dockerfile b/images/ska-tango-images-tango-vnc/Dockerfile
index 8f636672..98fa5275 100644
--- a/images/ska-tango-images-tango-vnc/Dockerfile
+++ b/images/ska-tango-images-tango-vnc/Dockerfile
@@ -60,7 +60,7 @@ RUN apt-get update && apt-mark hold iptables && \
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 && apt-get install -y \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
git \
x11vnc \
software-properties-common \
--
GitLab