commit 89ce2757e57357aef59d3c9a598b742b7d6b0f1c Author: Matthew Finkel sysrqb@torproject.org Date: Mon Dec 7 23:50:58 2020 +0000

fixup! Bug 40166: Update apt cache before calling pre_pkginst in container-image config

Bug 40169: Update apt package cache after calling pre_pkginst, too

The creation of some project containers require an updated apt cache before executing pre_pkginst, while others require updating the apt cache after executing pre_pkginst. --- projects/container-image/config | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/projects/container-image/config b/projects/container-image/config index e8f3f38..7520b8e 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -27,9 +27,14 @@ pre: | # [% c('var/container/suite') %] set -e export DEBIAN_FRONTEND=noninteractive + # Update the package cache so the container installs the most recent + # version of required packages. apt-get update -y -q [% IF pc(c('origin_project'), 'var/pre_pkginst') -%] [% pc(c('origin_project'), 'var/pre_pkginst') %] + # Update the package cache again because `pre_pkginst` may change the + # package manager configuration. + apt-get update -y -q [% END -%] apt-get upgrade -y -q [%