[gnome-runtime-images] base: properly set the dbus machine-id with dbus-uuidgen
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-runtime-images] base: properly set the dbus machine-id with dbus-uuidgen
- Date: Mon, 11 May 2020 05:57:58 +0000 (UTC)
commit 625c4f62efa7430cbb7bdbd9b9b9239fcbe20efa
Author: Jordan Petridis <jpetridis gnome org>
Date: Mon May 11 08:26:45 2020 +0300
base: properly set the dbus machine-id with dbus-uuidgen
there's a utility to do it so we might as well use it
base | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/base b/base
index 035e3cb..2d93d38 100644
--- a/base
+++ b/base
@@ -17,17 +17,17 @@ ENV FLATPAK_GL_DRIVERS=dummy
RUN useradd --home-dir /build --create-home --shell /bin/bash build
WORKDIR /build
-# Add a machine-id as specified in the freedesktop spec:
-# https://www.freedesktop.org/software/systemd/man/machine-id.html
-# gnome-builder test suite depends on this
-RUN cat /dev/urandom | tr -dc a-f0-9 | head -c32 > /etc/machine-id && echo "" >> /etc/machine-id
-
RUN dnf upgrade -y --best --allowerasing && \
dnf install -y flatpak flatpak-builder librsvg2 ostree fuse elfutils \
- dconf dbus-daemon git bzr xorg-x11-server-Xvfb dbus-x11 python3-ruamel-yaml \
+ dconf dbus-daemon dbus-tools git bzr xorg-x11-server-Xvfb dbus-x11 python3-ruamel-yaml \
python3-gobject json-glib && \
dnf clean all
+# generate machine-id as specified in the freedesktop spec:
+# https://www.freedesktop.org/software/systemd/man/machine-id.html
+# for exmaple, gnome-builder test suite depends on this
+RUN dbus-uuidgen > /etc/machine-id
+
COPY rewrite-flatpak-manifest /usr/local/bin/rewrite-flatpak-manifest
USER build
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]