Skip to content

Commit fe8fac5

Browse files
committed
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).
1 parent 09b205d commit fe8fac5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/containers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
strategy:
2323
matrix:
24-
baseimage: ['debian:stretch', 'ubuntu:16.04', 'ubuntu:18.04']
24+
baseimage: ['debian:stretch', 'ubuntu:18.04', 'ubuntu:20.04']
2525
steps:
2626
- run: sudo apt-get -qq update
2727
- name: Install libsystemd-dev
@@ -38,7 +38,7 @@ jobs:
3838
- name: Pull base image - ${{ matrix.baseimage }}
3939
run: docker pull ${{ matrix.baseimage }}
4040
- name: Install packages for ${{ matrix.baseimage }}
41-
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"
41+
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"
4242
- name: Persist base container
4343
run: docker commit `cat /tmp/cidfile` go-systemd/container-tests
4444
- run: rm -f /tmp/cidfile

0 commit comments

Comments
 (0)