From 5df7ed0f6380e26c171a4a87335c528ce8fc2925 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 5 Nov 2024 20:35:47 +0900 Subject: [PATCH] Back to the original, almost --- Dockerfile | 47 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/Dockerfile b/Dockerfile index 241a670..9d56301 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,33 +1,20 @@ -# Based on: https://github.com/ebassi/flathub-docker/blob/master/base/Dockerfile +# Use Fedora as the base image +FROM fedora:41 -FROM debian:stretch-slim +# Install the required packages +RUN dnf install -y \ + flatpak \ + flatpak-builder \ + p7zip \ + xmlstarlet \ + bzip2 \ + curl \ + jq && \ + dnf clean all -RUN echo "deb-src http://httpredir.debian.org/debian stretch main" >> /etc/apt/sources.list +# Add flathub and flathub-beta remotes for flatpak +RUN flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \ + flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo -RUN apt-get update -qq && \ - apt-get install -qq -y --no-install-recommends \ - flatpak \ - git-core \ - locales \ - make && \ - p7zip \ - xmlstarlet \ - bzip2 \ - curl \ - jq \ - rm -rf /usr/share/doc/* /usr/share/man/* - -RUN locale-gen C.UTF-8 && /usr/sbin/update-locale LANG=C.UTF-8 - -ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 - -COPY flatpak-build.sh /root -RUN chmod +x /root/flatpak-build.sh - -RUN /root/flatpak-build.sh - -RUN flatpak remote-add --if-not-exists flathub https://dl.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 https://sdk.gnome.org/gnome.flatpakrepo - -ENTRYPOINT [ "flatpak-builder" ] \ No newline at end of file +# Set default command (optional, for testing purposes) +ENTRYPOINT [ "flatpak-builder", "--no-sandbox", "--install-deps-from=flathub", "--install-deps-from=flathub-beta" ] \ No newline at end of file