From f84a6d94c7bd28f5d450f997b395e94b1cff36ae Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 18 Nov 2025 15:00:15 -0600 Subject: [PATCH] Gitlab sage, Docker: Add snmp and rsync Add snmp and rsync to the normal docker image. While these tools are only required for the lab on sage, I think it's a small enough addition to be worth always including at this point. A higher level TODO I think may be to see if we can / should split the resulting container up, or if there's host tooling we can remove at a later step, after building all the software we require. Signed-off-by: Tom Rini --- .gitlab-ci-sage-lab.yml | 2 -- tools/docker/Dockerfile | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-sage-lab.yml b/.gitlab-ci-sage-lab.yml index 911132b6b00..f2fa0e3e771 100644 --- a/.gitlab-ci-sage-lab.yml +++ b/.gitlab-ci-sage-lab.yml @@ -27,8 +27,6 @@ pip install -r test/py/requirements.txt -r tools/binman/requirements.txt -r tools/buildman/requirements.txt -r tools/u_boot_pylib/requirements.txt labgrid setuptools - # Add more tools - - sudo apt-get update && sudo apt-get -y install snmp rsync # Acquire and turn on the exporter. - labgrid-client reserve --wait board=${LABGRID_EXPORTER} && labgrid-client -p ${LABGRID_EXPORTER} acquire && diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index fd8765af458..bcb95a8cae3 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -131,7 +131,9 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ python3-tomli \ python3-venv \ rpm2cpio \ + rsync \ sbsigntool \ + snmp \ socat \ softhsm2 \ sparse \ -- 2.47.3