[gbm-web] flat-manager: Switch to Ubuntu 18.04

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

commit 81e06b9e23ede8806d5f438603e56c463de6e475
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Tue Jul 14 07:53:20 2020 +0200

    flat-manager: Switch to Ubuntu 18.04
    
    As it's what Flathub uses (although not via Docker).

 flat-manager/Dockerfile                          | 20 ++++++++++----------
 flat-manager/ppa_alexlarsson_flatpak_bionic.list |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/flat-manager/Dockerfile b/flat-manager/Dockerfile
index d67ce11..dc2a2c7 100644
--- a/flat-manager/Dockerfile
+++ b/flat-manager/Dockerfile
@@ -1,23 +1,23 @@
-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/flatpak/flat-manager.git && cd flat-manager && \
     git checkout 0.3.7 && /root/.cargo/bin/cargo fetch
+RUN cd flat-manager && /root/.cargo/bin/cargo build --release
+
+FROM ubuntu:18.04
 
-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/*
 
+COPY --from=0 /flat-manager/target/release/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/ppa_alexlarsson_flatpak_bionic.list 
b/flat-manager/ppa_alexlarsson_flatpak_bionic.list
new file mode 100644
index 0000000..d10254b
--- /dev/null
+++ b/flat-manager/ppa_alexlarsson_flatpak_bionic.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/alexlarsson/flatpak/ubuntu bionic main