From c31eb9b36d53192665f38bea7bebc5fcc1cc3d05 Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Tue, 12 Dec 2023 16:38:05 -0500 Subject: ci: squash deps packages into one apt cmd makes containers smaller and improves caching logic --- contrib/ci/Containerfile | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile index c90204e20..77239820e 100644 --- a/contrib/ci/Containerfile +++ b/contrib/ci/Containerfile @@ -25,25 +25,18 @@ RUN apt-get update -yqq && \ python3-sphinx-rtd-theme \ recutils \ texinfo \ - zlib1g-dev - -# Debian packaging tools -RUN apt-get install -yqq \ + zlib1g-dev \ + # Debian packaging tools \ po-debconf \ build-essential \ debhelper-compat \ devscripts \ - git-buildpackage - -# Documentation dependencies -RUN apt-get install -yqq \ - codespell \ + git-buildpackage \ + # Documentation dependencies \ doxygen \ - graphviz - -# Test suite dependencies -RUN apt-get install -yqq \ - jq \ + graphviz \ + # Test suite dependencies \ + jq \ postgresql \ sudo \ wget -- cgit v1.2.3