From fe8fac503b9ea1ed64085bd54f53c767be451c54 Mon Sep 17 00:00:00 2001
From: WGH <wgh@torlan.ru>
Date: Sat, 5 Nov 2022 13:23:29 +0300
Subject: [PATCH] ci: bump Ubuntu versions for container workflows

A test that will be added in a latter commit requires systemd-run --wait,
which is not available on Ubuntu 16.04.

DEBIAN_FRONTEND=noninteractive prevents hang on "Setting up tzdata"
that became a problem on Ubuntu 20.04 (though something similar
could happen on any Debian/Ubuntu version).
---
 .github/workflows/containers.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index 3087aee7..acb2a8c9 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        baseimage: ['debian:stretch', 'ubuntu:16.04', 'ubuntu:18.04']
+        baseimage: ['debian:stretch', 'ubuntu:18.04', 'ubuntu:20.04']
     steps:
       - run: sudo apt-get -qq update
       - name: Install libsystemd-dev
@@ -38,7 +38,7 @@ jobs:
       - name: Pull base image - ${{ matrix.baseimage }}
         run: docker pull ${{ matrix.baseimage }}
       - name: Install packages for ${{ matrix.baseimage }}
-        run: docker run --privileged -e GOPATH=${GOPATH} --cidfile=/tmp/cidfile ${{ matrix.baseimage }} /bin/bash -c "apt-get update && apt-get install -y sudo build-essential git golang dbus libsystemd-dev libpam-systemd systemd-container"
+        run: docker run --privileged -e GOPATH=${GOPATH} --cidfile=/tmp/cidfile ${{ matrix.baseimage }} /bin/bash -c "export DEBIAN_FRONTEND=noninteractive; apt-get update && apt-get install -y sudo build-essential git golang dbus libsystemd-dev libpam-systemd systemd-container"
       - name: Persist base container
         run: docker commit `cat /tmp/cidfile` go-systemd/container-tests
       - run: rm -f /tmp/cidfile