Commit 799ccf05 authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'boklm/bug_29194_v2'

parents e39c1dbe a4689ee1

projects/container-image/config

+3 −2
Original line number Diff line number Diff line
@@ -17,11 +17,12 @@ pre: | 
  #!/bin/sh

  # [% c('var/container/suite') %]

  set -e

  export DEBIAN_FRONTEND=noninteractive

  [% IF pc(c('origin_project'), 'var/pre_pkginst') -%]

  [% pc(c('origin_project'), 'var/pre_pkginst') %]

  [% END -%]

  apt-get update -y

  apt-get upgrade -y

  apt-get update -y -q

  apt-get upgrade -y -q

  [%

     deps = [];

     IF pc(c('origin_project'), 'var/deps');

projects/debootstrap-image/config

+3 −2
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ var: 
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

  apt-get update -y

  apt-get install -y debian-archive-keyring ubuntu-keyring debootstrap

  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") %]

  [% IF c("var/apt_package_filename") || c("var/apt_utils_package_filename") || c("var/libapt_inst_package_filename") || c("var/libapt_pkg_package_filename") -%]

    mkdir ./base-image/apt-update

rbm @ c61e6940

Original line number Diff line number Diff line 
Subproject commit eb500fa9467fb4d7229c9ca87f202ef18603d023
 
Subproject commit c61e6940a1824462648064898be0759dd1600414