[gbm-web] Merge ostree variant into the main image

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

commit fb979455d919e19c97370ed03936b695b4870bfb
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Wed Sep 16 12:58:43 2020 +0200

    Merge ostree variant into the main image

 flat-manager/Dockerfile => Dockerfile                       |  6 ++++++
 flat-manager-ostree/Dockerfile                              | 13 -------------
 flat-manager-ostree/Dockerfile.builder                      | 10 ----------
 flat-manager-ostree/heartbeat                               |  6 ------
 flat-manager-ostree/ppa_alexlarsson_flatpak_bionic.list     |  1 -
 flat-manager/gpg-heartbeat.c => gpg-heartbeat.c             |  0
 ...alexlarsson_flatpak.list => ppa_alexlarsson_flatpak.list |  0
 7 files changed, 6 insertions(+), 30 deletions(-)
---
diff --git a/flat-manager/Dockerfile b/Dockerfile
similarity index 70%
rename from flat-manager/Dockerfile
rename to Dockerfile
index 05c19e9..e050bbd 100644
--- a/flat-manager/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,10 @@ 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
 
+RUN git clone -b general_ostree https://github.com/abderrahim/flat-manager.git /flat-manager-ostree && \
+    cd flat-manager-ostree && /root/.cargo/bin/cargo fetch
+RUN cd flat-manager-ostree && /root/.cargo/bin/cargo build --release
+
 ADD gpg-heartbeat.c /gpg-heartbeat.c
 RUN gcc -s /gpg-heartbeat.c $(gpgme-config --libs --cflags) -o /gpg-heartbeat
 
@@ -20,6 +24,8 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C793BFA2FA577F07 &&
     rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /flat-manager/target/release/flat-manager /usr/local/bin/flat-manager
+COPY --from=builder /flat-manager/target/release/delta-generator-client /usr/local/bin/delta-generator-client
+COPY --from=builder /flat-manager-ostree/target/release/flat-manager /usr/local/bin/flat-manager-ostree
 COPY --from=builder /gpg-heartbeat /usr/local/bin/gpg-heartbeat
 
 ENV HOME /srv/gnome-build-meta
diff --git a/flat-manager/gpg-heartbeat.c b/gpg-heartbeat.c
similarity index 100%
rename from flat-manager/gpg-heartbeat.c
rename to gpg-heartbeat.c
diff --git a/flat-manager/ppa_alexlarsson_flatpak.list b/ppa_alexlarsson_flatpak.list
similarity index 100%
rename from flat-manager/ppa_alexlarsson_flatpak.list
rename to ppa_alexlarsson_flatpak.list