From f3d725f4001b1cfa78a3b0c52ec1b31acf7328aa Mon Sep 17 00:00:00 2001 From: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> Date: Mon, 2 Jun 2025 09:07:18 +0200 Subject: [PATCH] Devenv: Add requirements.txt and versions + hashes to collectd Dockerfile (#106175) * Add requirements.txt and version+hashes * Update docker image --- devenv/docker/blocks/collectd/Dockerfile | 9 ++++++--- devenv/docker/blocks/collectd/requirements.txt | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 devenv/docker/blocks/collectd/requirements.txt diff --git a/devenv/docker/blocks/collectd/Dockerfile b/devenv/docker/blocks/collectd/Dockerfile index 00762cd0149..13768c86c04 100644 --- a/devenv/docker/blocks/collectd/Dockerfile +++ b/devenv/docker/blocks/collectd/Dockerfile @@ -1,16 +1,19 @@ -FROM ubuntu:xenial +FROM ubuntu:jammy ENV DEBIAN_FRONTEND=noninteractive RUN apt-get -y update -RUN apt-get -y install collectd curl python-pip +RUN apt-get -y install collectd curl python3-pip # add a fake mtab for host disk stats ADD etc_mtab /etc/mtab ADD collectd.conf.tpl /etc/collectd/collectd.conf.tpl -RUN pip install --no-cache-dir envtpl +# Install Python packages +ADD requirements.txt /tmp/requirements.txt +RUN pip3 install --require-hashes --no-cache-dir -r /tmp/requirements.txt + ADD start_container /usr/bin/start_container RUN chmod +x /usr/bin/start_container CMD start_container diff --git a/devenv/docker/blocks/collectd/requirements.txt b/devenv/docker/blocks/collectd/requirements.txt new file mode 100644 index 00000000000..7a77b9a89aa --- /dev/null +++ b/devenv/docker/blocks/collectd/requirements.txt @@ -0,0 +1,6 @@ +envtpl==0.7.0 \ + --hash=sha256:cfc5bec6c554fa2b1578980f4c2931dd0db128f14f5a7f4c91c3280167e30cf9 +Jinja2==3.1.6 \ + --hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d +MarkupSafe==2.1.5 \ + --hash=sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b \ No newline at end of file