[tor-commits] [builders/tor-browser-build] 01/02: Bug 40426: Update Ubuntu base image to 22.04

[gitolite role]

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master
in repository builders/tor-browser-build.

commit 6c656da4fed3aa2d38264ade90eaaa80088d9134
Author: Georg Koppen <gk at torproject.org>
AuthorDate: Sat Apr 30 20:04:50 2022 +0000

    Bug 40426: Update Ubuntu base image to 22.04
    
    This is necessary for the mmdebstrap bump to 0.8.6 as well (#40288).
    
    For the Jessie woes see:
    https://gitlab.mister-muffin.de/josch/mmdebstrap/issues/2#issuecomment-152.
    
    Closes: #40426.
---
 projects/mmdebstrap-image/config | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/projects/mmdebstrap-image/config b/projects/mmdebstrap-image/config
index f326728..c25a6c4 100644
--- a/projects/mmdebstrap-image/config
+++ b/projects/mmdebstrap-image/config
@@ -4,7 +4,7 @@ version: 1
 pkg_type: build
 
 var:
-  ubuntu_version: 20.04.1
+  ubuntu_version: 22.04
 
   container:
     use_container: 1
@@ -42,13 +42,10 @@ targets:
       container:
         suite: jessie
         arch: amd64
-
-  buster-amd64:
-    var:
-      minimal_apt_version: 1.8.2
-      container:
-        suite: buster
-        arch: amd64
+        debian_mirror: >
+          "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://deb.debian.org/debian jessie main"
+          "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://deb.debian.org/debian jessie-updates main"
+          "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://security.debian.org/debian-security jessie/updates main"
 
   bullseye-amd64:
     var:
@@ -62,5 +59,5 @@ input_files:
     name: mmdebstrap
   - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'
     filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'
-    sha256sum: 97f6cbcf41f39272c84e32b6f926ed5d6906c6e463a557025181f4aa191ad667
+    sha256sum: df6fe77cee11bd216ac532f0ee082bdc4da3c0cc1f1d9cb20f3f743196bc4b07
   - filename: mmdebstrap-no-user-ns.patch

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.