From 1cd325c7ed40f595d296fd94d0f67e0ddf3dd80f Mon Sep 17 00:00:00 2001 From: Matthew Finkel Date: Mon, 7 Dec 2020 23:50:58 +0000 Subject: [PATCH 1/2] 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/container-image/config b/projects/container-image/config index e8f3f38a..e494f114 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -31,6 +31,7 @@ pre: | [% IF pc(c('origin_project'), 'var/pre_pkginst') -%] [% pc(c('origin_project'), 'var/pre_pkginst') %] [% END -%] + apt-get update -y -q apt-get upgrade -y -q [% deps = []; -- GitLab From 7b520a40cf7452898a0bc7825372bc3a9ee80168 Mon Sep 17 00:00:00 2001 From: Matthew Finkel Date: Tue, 8 Dec 2020 16:19:57 +0000 Subject: [PATCH 2/2] fixup! fixup! Bug 40166: Update apt cache before calling pre_pkginst in container-image config --- projects/container-image/config | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/container-image/config b/projects/container-image/config index e494f114..7520b8e2 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -27,11 +27,15 @@ 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') %] - [% END -%] + # 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 [% deps = []; -- GitLab