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 <trini@konsulko.com>

diff --git a/.gitlab-ci-sage-lab.yml b/.gitlab-ci-sage-lab.yml
index 911132b6b00de7ece71d0c623ac26c41a41bfb21..f2fa0e3e7719dd72cf524044f11b82b4fc04d871 100644 (file)
--- 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 fd8765af4585413b0ae650365d32aa62aa7ea090..bcb95a8cae3f5573b517f97b4ae85bc884abb1f6 100644 (file)
--- 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 \