Bug 31130: Use Debian 10 for our Android container images

projects/debootstrap-image/config

@@ -15,8 +15,10 @@ pre: |
   #!/bin/sh
   set -e
   export DEBIAN_FRONTEND=noninteractive
-  # Bug 29158: install fixed packages for apt vulnerability (CVE-2019-3462)
-  dpkg -i ./apt_1.6.6ubuntu0.1_amd64.deb ./libapt-pkg5.0_1.6.6ubuntu0.1_amd64.deb
+  [% IF ! c("var/buster") -%]
+    # Bug 29158: install fixed packages for apt vulnerability (CVE-2019-3462)
+    dpkg -i ./apt_1.6.6ubuntu0.1_amd64.deb ./libapt-pkg5.0_1.6.6ubuntu0.1_amd64.deb
+  [% END -%]
   apt-get update -y -q
   apt-get install -y -q debian-archive-keyring ubuntu-keyring debootstrap
   debootstrap --arch=[% c("var/container/arch") %] [% c("var/container/debootstrap_opt") %] [% c("var/container/suite") %] base-image [% c("var/container/debootstrap_mirror") %]
@@ -36,6 +38,10 @@ pre: |
     echo "apt version: $apt_version"
     dpkg --compare-versions "$apt_version" ge '[% c("var/minimal_apt_version") %]'
   [% END -%]
+  [% IF c("var/buster") -%]
+    echo 'deb http://ftp.us.debian.org/debian unstable main' >> ./base-image/etc/apt/sources.list
+  [% END -%]
+
   tar -C ./base-image -czf [% dest_dir %]/[% c("filename") %] .
 
 targets:
@@ -65,14 +71,30 @@ targets:
         suite: stretch
         arch: amd64
 
+  buster-amd64:
+    var:
+      buster: 1
+      ubuntu_version: 19.10
+      minimal_apt_version: 1.8.2
+      container:
+        suite: buster
+        arch: amd64
+
 input_files:
   - URL: 'http://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: ed76e649f65548a80b361b68011085ec4dde7bb762d667657acbef87765e1a12
+    sha256sum: 607f5f1329ef819597b136910f368f67fe661948d3db2c4ff971c7813b9940b4
+    enable: '[% ! c("var/buster") %]'
+  - URL: 'http://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: eedcb1dc0ccc86b59eb1f89960c322a2ba3ed3e0323a20a1da8bcc0e6f100f4f
+    enable: '[% c("var/buster") %]'
   - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/apt_1.6.6ubuntu0.1_amd64.deb
     sha256sum: df210f9e30cf9deba5fbe815203af854e5e77bdbbe0b96d0d1c0da46a6a8dd0a
+    enable: '[% ! c("var/buster") %]'
   - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/libapt-pkg5.0_1.6.6ubuntu0.1_amd64.deb
     sha256sum: 0a05a97b1e9b8d52ee8df040a14c5fabdebbb2c2235ac495db29df34f4c8cec3
+    enable: '[% ! c("var/buster") %]'
   - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/apt_package_filename") %]'
     sha256sum: '[% c("var/apt_package_sha256sum") %]'
     enable: '[% c("var/apt_package_filename") %]'

rbm.conf

@@ -220,7 +220,7 @@ targets:
       android_min_api_x86_64: 21
       snowflake: 0
       container:
-        suite: stretch
+        suite: buster
         arch: amd64
       deps:
         - build-essential