[gbm-web] flat-manager-ostree: Apply changes from the main image

[Bartłomiej Piotrowski <bpiotrowski src gnome org>]

commit 7858b0910a6d1b2ed14c898baa5db1b439dbf11f
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Tue Jul 14 21:04:05 2020 +0200

    flat-manager-ostree: Apply changes from the main image

 flat-manager-ostree/Dockerfile                     | 24 +++++++---------------
 flat-manager-ostree/Dockerfile.builder             | 10 +++++++++
 .../ppa_alexlarsson_flatpak_bionic.list            |  1 +
 3 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/flat-manager-ostree/Dockerfile b/flat-manager-ostree/Dockerfile
index 6ac2cfd..0926cd0 100644
--- a/flat-manager-ostree/Dockerfile
+++ b/flat-manager-ostree/Dockerfile
@@ -1,23 +1,13 @@
-FROM debian:buster-backports
+FROM ubuntu:18.04
 
-RUN apt-get update && apt-get install -y git libpq-dev curl build-essential
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh && \
-    sh rustup.sh -y -q
-
-RUN apt-get install -y gnupg2 && \
-    apt-get install -y -t buster-backports flatpak ostree
-
-RUN git clone https://github.com/abderrahim/flat-manager.git -b general_ostree && \
-    cd flat-manager && /root/.cargo/bin/cargo fetch
-
-RUN cd flat-manager && /root/.cargo/bin/cargo build --release && \
-    ls /flat-manager/target/release && \
-    cp /flat-manager/target/release/flat-manager /usr/local/bin &&\
-    cd / && rm -rf flat-manager /root/.cargo /root/.rustup && \
-    apt-get remove -y build-essential && apt-get autoremove -y
+RUN apt-get update && apt-get install -y gnupg2
+ADD ppa_alexlarsson_flatpak_bionic.list /etc/apt/sources.list.d/
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C793BFA2FA577F07 && \
+    apt-get update && apt-get install -y flatpak ostree libpq5 && \
+    rm -rf /var/lib/apt/lists/*
 
+ADD flat-manager /usr/local/bin/flat-manager
 ADD heartbeat /heartbeat
 
-USER 1000210000
 ENV HOME /srv/gnome-build-meta
 EXPOSE 8080
diff --git a/flat-manager-ostree/Dockerfile.builder b/flat-manager-ostree/Dockerfile.builder
new file mode 100644
index 0000000..55c1a94
--- /dev/null
+++ b/flat-manager-ostree/Dockerfile.builder
@@ -0,0 +1,10 @@
+FROM ubuntu:18.04
+
+RUN apt-get update && apt-get install -y git libpq-dev curl build-essential
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh && \
+    sh rustup.sh -y -q
+
+RUN git clone -b general_ostree https://github.com/flatpak/flat-manager.git && \
+    cd flat-manager && /root/.cargo/bin/cargo fetch
+
+RUN cd flat-manager && /root/.cargo/bin/cargo build --release
diff --git a/flat-manager-ostree/ppa_alexlarsson_flatpak_bionic.list 
b/flat-manager-ostree/ppa_alexlarsson_flatpak_bionic.list
new file mode 100644
index 0000000..d10254b
--- /dev/null
+++ b/flat-manager-ostree/ppa_alexlarsson_flatpak_bionic.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/alexlarsson/flatpak/ubuntu bionic main