From c64c58af42508896e6f863e399625d1aa0ff6506 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Wed, 22 Feb 2023 15:13:02 -0500 Subject: [PATCH 1/2] update builder image to version tagged 2023_02_22 --- molecule/builder-focal/image_hash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/molecule/builder-focal/image_hash b/molecule/builder-focal/image_hash index 8786214fca..457445bc52 100644 --- a/molecule/builder-focal/image_hash +++ b/molecule/builder-focal/image_hash @@ -1,2 +1,2 @@ -# sha256 digest quay.io/freedomofpress/sd-docker-builder-focal:2022_12_07 -0cf762a1c96b6b33d2cded24e29552933ec5be81b80a7ec94fbf4e2fda9d9b77 +# sha256 digest quay.io/freedomofpress/sd-docker-builder-focal:2023_02_22 +5c684ede91c2227f59f6f8393dcdcbec8616b13e62eaddfcdaca8c42bda7f668 From c384a0e7b5998e5d1634d55166a4f82b32a570da Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Mon, 12 Dec 2022 12:16:10 -0500 Subject: [PATCH 2/2] Pin dh-virtualenv from jammy, not impish Follows up ed806f1d4a2f782, which switched sources.list. (cherry picked from commit 7a8d1422406dd42108e50f1ba8ff3f9930680235) --- molecule/builder-focal/dh-virtualenv.pref | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/molecule/builder-focal/dh-virtualenv.pref b/molecule/builder-focal/dh-virtualenv.pref index 4a1bb80aa7..90dcd55cd7 100644 --- a/molecule/builder-focal/dh-virtualenv.pref +++ b/molecule/builder-focal/dh-virtualenv.pref @@ -3,9 +3,9 @@ Pin: release a=focal Pin-Priority: 500 Package: dh-virtualenv libjs-sphinxdoc sphinx-rtd-theme-common -Pin: release a=impish +Pin: release a=jammy Pin-Priority: 700 Package: * -Pin: release a=impish +Pin: release a=jammy Pin-Priority: 1