From 7976ecc12af5a460b2755494d460aeb1d2ae58c7 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 25 Oct 2022 19:11:24 +0200 Subject: [PATCH] buildserver: mark fdroidserver deps as manual This lets build steps use `apt-get autoremove` and still have a working fdroidserver. --- buildserver/Dockerfile | 1 - buildserver/provision-apt-get-install | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildserver/Dockerfile b/buildserver/Dockerfile index fcb50974..73f5ffe3 100644 --- a/buildserver/Dockerfile +++ b/buildserver/Dockerfile @@ -53,7 +53,6 @@ RUN printf "path-exclude=/usr/share/locale/*\npath-exclude=/usr/share/man/*\npat && bash /opt/buildserver/provision-gradle \ && bash /opt/buildserver/provision-buildserverid $GIT_REV_PARSE_HEAD \ && rm -rf /vagrant/cache \ - && apt-mark manual `apt-cache depends fdroidserver | sed -nE 's,^[| ]*Depends: ([a-z0-9 -]+),\1,p'` \ && apt-get autoremove --purge \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/buildserver/provision-apt-get-install b/buildserver/provision-apt-get-install index 7edec156..b369d36f 100644 --- a/buildserver/provision-apt-get-install +++ b/buildserver/provision-apt-get-install @@ -115,12 +115,13 @@ packages=" apt-get install $packages --download-only apt-get install $packages -apt-get autoremove --purge # fdroidserver comes from git, it was installed just for dependencies +apt-mark manual `apt-cache depends fdroidserver | sed -nE 's,^[| ]*Depends: ([a-z0-9 -]+),\1,p'` apt-get purge fdroidserver # clean up things that will become outdated anyway +apt-get autoremove --purge apt-get clean rm -rf /var/lib/apt/lists/*