Fix grafana datasource authentication in Charmed OSM

[osm/devops.git] / docker / MON / Dockerfile

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 765324c..719d633 100644 (file)
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -30,7 +30,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     python3-setuptools=45.2.* \
     python3-dev=3.8.* \
     openssh-client=1:8.* && \
-    python3 -m easy_install pip==21.0.1
+    python3 -m easy_install pip==21.0.1 setuptools==51.0.0
 
 ARG PYTHON3_OSM_COMMON_URL
 ARG PYTHON3_OSM_MON_URL
@@ -53,10 +53,10 @@ RUN pip3 install \
 FROM ubuntu:20.04 as FINAL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.8.*
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    ca-certificates
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    python3-minimal=3.8.* \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
 COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages  /usr/local/lib/python3.8/dist-packages