summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2019-12-11 16:16:36 +0100
committerBenjamin Berg <bberg@redhat.com>2019-12-11 16:20:33 +0100
commit422f6f52b40a089aa5d9dcf949163f02628ccab3 (patch)
tree48bd447bc2cfb44b1635eb5e69cd8f8318329950
parent7186d090858c025e88f51bb4a6450bb277ee5e84 (diff)
downloadmutter-benzea/ci-add-machine-id.tar.gz
ci: Always generate a machine IDbenzea/ci-add-machine-id
At least the F30 base image does not seem to ship with a machine-id. This causes tests that require DBus to fail as the dbus daemon cannot be started. https://gitlab.gnome.org/GNOME/mutter/merge_requests/967
-rw-r--r--.gitlab-ci/Dockerfile4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 6d2548c18..6465ed0a3 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -27,3 +27,7 @@ RUN dnf -y update && dnf -y upgrade && \
dnf remove -y --noautoremove mutter mutter-devel && \
dnf clean all
+
+# Add a machine-id as specified in the freedesktop spec:
+# https://www.freedesktop.org/software/systemd/man/machine-id.html
+RUN cat /dev/urandom | tr -dc a-f0-9 | head -c32 > /etc/machine-id && echo "" >> /etc/machine-id