From e28acecbef7f8a4b8d87b681cce9ead4cabd2d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Gro=C3=9F?= <magnus@mggross.com>
Date: Sun, 12 Nov 2023 10:30:05 +0100
Subject: [PATCH] Layer appimage build on appimage-qt6

Now the build pipeline for appimages is finally complete.

Supersedes #3
---
 Dockerfile                | 12 ++++++------
 scripts/build-appimage.sh |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d95d7fc..1e9588c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM vimpostor/arch-qt6
+# Build with: podman build -t blobdrop .
+# Run with: podman run -v "$PWD:/output" blobdrop
+FROM docker.io/vimpostor/appimage-qt6
 
-# default compiler
-ARG cxx=g++
-ENV CXX=$cxx
+RUN apt-get -y install libxcb-ewmh-dev
 
 ADD . /build
 WORKDIR /build
-RUN pacman -Syu --noconfirm imagemagick
-RUN scripts/build.sh
+RUN scripts/build-appimage.sh
+CMD cp *-x86_64.AppImage /output
diff --git a/scripts/build-appimage.sh b/scripts/build-appimage.sh
index b898e9e..1e436dd 100755
--- a/scripts/build-appimage.sh
+++ b/scripts/build-appimage.sh
@@ -22,4 +22,4 @@ EOF
 mkdir -p AppDir/usr/share/icons/hicolor/scalable/apps
 cp assets/blobdrop.svg AppDir/usr/share/icons/hicolor/scalable/apps/
 
-QML_SOURCES_PATHS="$PWD/src/qml" QMAKE="$(which qmake)" linuxdeploy --appdir AppDir --plugin qt --output appimage
+QML_SOURCES_PATHS="$PWD/src/qml" linuxdeploy --appdir AppDir --plugin qt --output appimage