From 57f55a3184e8c66a2cf03bb582d529d16b375ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= Date: Tue, 12 Dec 2023 15:01:47 +0100 Subject: [PATCH] Switch Docker image to use Flathub's flatpak-builder-lint This way, all tools match the one used on Flathub infra, and reduce potential breakage caused by Fedora bumping packages. --- Dockerfile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0f20685e..f15edf0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,6 @@ -FROM fedora:latest - -RUN dnf update -y && \ - dnf install -y dbus-daemon flatpak flatpak-builder git-lfs python3-aiohttp python3-tenacity python3-gobject xorg-x11-server-Xvfb ccache zstd libappstream-glib && \ - dnf clean all +FROM ghcr.io/flathub/flatpak-builder-lint:latest +ENTRYPOINT [] RUN flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo RUN flatpak remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo RUN flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo - -RUN flatpak install flathub org.flatpak.Builder -y - -ADD --chmod=755 https://raw.githubusercontent.com/flatpak/flat-manager/b07fe8652357ce16d9625f72f9acceaca94d860a/flat-manager-client /usr/bin