From 09245ff74e92919a26f0ca6212db90985e75cd34 Mon Sep 17 00:00:00 2001 From: Roman Meier Date: Wed, 25 Mar 2020 11:34:17 +0100 Subject: [PATCH 1/2] Add Dockerfile for linux-flatpak --- linux-flatpak/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 linux-flatpak/Dockerfile diff --git a/linux-flatpak/Dockerfile b/linux-flatpak/Dockerfile new file mode 100644 index 0000000..77d6ce8 --- /dev/null +++ b/linux-flatpak/Dockerfile @@ -0,0 +1,9 @@ +FROM ubuntu:18.04 +MAINTAINER yuzu + +RUN useradd -m -s /bin/bash yuzu +RUN apt-get update && apt-get -y full-upgrade && apt-get install --no-install-recommends -y flatpak flatpak-builder ca-certificates +RUN flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +RUN flatpak install -v -y flathub org.kde.Platform//5.13 org.kde.Sdk//5.13 +RUN apt-get install --no-install-recommends -y build-essential libsdl2-dev libssl-dev python qtbase5-dev qtwebengine5-dev libqt5opengl5-dev wget git ccache cmake ninja-build dnsutils gnupg2 sshfs fuse elfutils + From 9daa154e90c6f34d0d24bd5f2bb9bbbaff4ef81c Mon Sep 17 00:00:00 2001 From: Roman Meier Date: Fri, 24 Apr 2020 08:28:33 +0200 Subject: [PATCH 2/2] linux-flatpak: Merge apt-get RUN statements --- linux-flatpak/Dockerfile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/linux-flatpak/Dockerfile b/linux-flatpak/Dockerfile index 77d6ce8..7da4432 100644 --- a/linux-flatpak/Dockerfile +++ b/linux-flatpak/Dockerfile @@ -1,9 +1,16 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 MAINTAINER yuzu -RUN useradd -m -s /bin/bash yuzu -RUN apt-get update && apt-get -y full-upgrade && apt-get install --no-install-recommends -y flatpak flatpak-builder ca-certificates -RUN flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -RUN flatpak install -v -y flathub org.kde.Platform//5.13 org.kde.Sdk//5.13 -RUN apt-get install --no-install-recommends -y build-essential libsdl2-dev libssl-dev python qtbase5-dev qtwebengine5-dev libqt5opengl5-dev wget git ccache cmake ninja-build dnsutils gnupg2 sshfs fuse elfutils - +RUN useradd -m -s /bin/bash yuzu && DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get -y full-upgrade \ + && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ + flatpak flatpak-builder \ + librsvg2-common \ + ca-certificates build-essential libsdl2-dev libssl-dev \ + python qtbase5-dev qtwebengine5-dev libqt5opengl5-dev \ + wget git ccache cmake \ + ninja-build dnsutils gnupg2 \ + sshfs fuse elfutils \ + && rm -Rf /var/lib/apt/lists/* \ + && flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo \ + && flatpak install -v -y flathub org.kde.Platform//5.13 org.kde.Sdk//5.13