From 0e05ce0b89d636dc0a7960e06e8976e929050214 Mon Sep 17 00:00:00 2001 From: yaso Date: Wed, 10 Jun 2026 09:37:57 +0200 Subject: [PATCH] WIP:update flatpak configs --- mih_ui/Dockerfile | 3 +- mih_ui/{mih_app_flatpak => flatpak}/main.png | Bin .../za.co.mzansiinnovationhub.mih.desktop | 0 ...za.co.mzansiinnovationhub.mih.metainfo.xml | 0 .../za.co.mzansiinnovationhub.mih.png | Bin .../flatpak/za.co.mzansiinnovationhub.mih.yml | 42 +++++++++++++ .../za.co.mzansiinnovationhub.mih.yml | 55 ------------------ mih_ui/pubspec.lock | 10 ++-- 8 files changed, 49 insertions(+), 61 deletions(-) rename mih_ui/{mih_app_flatpak => flatpak}/main.png (100%) rename mih_ui/{mih_app_flatpak => flatpak}/za.co.mzansiinnovationhub.mih.desktop (100%) rename mih_ui/{mih_app_flatpak => flatpak}/za.co.mzansiinnovationhub.mih.metainfo.xml (100%) rename mih_ui/{mih_app_flatpak => flatpak}/za.co.mzansiinnovationhub.mih.png (100%) create mode 100644 mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml delete mode 100644 mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.yml diff --git a/mih_ui/Dockerfile b/mih_ui/Dockerfile index c00cedf1..db90439b 100644 --- a/mih_ui/Dockerfile +++ b/mih_ui/Dockerfile @@ -14,9 +14,10 @@ ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:${PAT RUN flutter config --enable-web && flutter precache --web WORKDIR /app COPY pubspec.yaml pubspec.lock ./ +RUN flutter clean RUN flutter pub get COPY . . -RUN flutter build web --release -t ./lib/main_prod.dart +RUN flutter build web --release -t ./lib/main_prod.dart -v # --- STAGE 2: The Final Production Image --- FROM nginx:alpine diff --git a/mih_ui/mih_app_flatpak/main.png b/mih_ui/flatpak/main.png similarity index 100% rename from mih_ui/mih_app_flatpak/main.png rename to mih_ui/flatpak/main.png diff --git a/mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.desktop b/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.desktop similarity index 100% rename from mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.desktop rename to mih_ui/flatpak/za.co.mzansiinnovationhub.mih.desktop diff --git a/mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.metainfo.xml b/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.metainfo.xml similarity index 100% rename from mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.metainfo.xml rename to mih_ui/flatpak/za.co.mzansiinnovationhub.mih.metainfo.xml diff --git a/mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.png b/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.png similarity index 100% rename from mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.png rename to mih_ui/flatpak/za.co.mzansiinnovationhub.mih.png diff --git a/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml b/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml new file mode 100644 index 00000000..f097fd9b --- /dev/null +++ b/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml @@ -0,0 +1,42 @@ +id: za.co.mzansiinnovationhub.mih +runtime: org.freedesktop.Platform +runtime-version: "25.08" +sdk: org.freedesktop.Sdk +command: mzansi_innovation_hub + +finish-args: + - --share=ipc + - --share=network + - --socket=fallback-x11 + - --socket=wayland + - --device=dri + +modules: + - name: mzansi-innovation-hub + buildsystem: simple + sources: + - type: archive + url: https://git.mzansi-innovation-hub.co.za/yaso_meth/mih-project/releases/download/v.1.3.0/mzansi_innovation_hub.tar.gz + archive-type: tar-gzip + strip-components: 0 + sha256: 8efff8baf8d9be44b70f3af500d985e80f2eb5a25cc421ce5c4f88b83f44ebe0 + - type: file + path: za.co.mzansiinnovationhub.mih.desktop + - type: file + path: za.co.mzansiinnovationhub.mih.metainfo.xml + - type: file + path: za.co.mzansiinnovationhub.mih.png + + build-commands: + - mkdir -p /app/bin + - mkdir -p /app/share/applications + - mkdir -p /app/share/metainfo + - mkdir -p /app/share/icons/hicolor/256x256/apps + + - cp mzansi_innovation_hub /app/bin/ + - cp -r lib/ /app/bin/ + - cp -r data/ /app/bin/ + + - install -Dm644 za.co.mzansiinnovationhub.mih.desktop /app/share/applications/za.co.mzansiinnovationhub.mih.desktop + - install -Dm644 za.co.mzansiinnovationhub.mih.png /app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png + - install -Dm644 za.co.mzansiinnovationhub.mih.metainfo.xml /app/share/metainfo/za.co.mzansiinnovationhub.mih.metainfo.xml diff --git a/mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.yml b/mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.yml deleted file mode 100644 index 0d681e07..00000000 --- a/mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.yml +++ /dev/null @@ -1,55 +0,0 @@ -id: za.co.mzansiinnovationhub.mih -runtime: org.freedesktop.Platform -runtime-version: '24.08' -sdk: org.freedesktop.Sdk -command: mzansi_innovation_hub - -finish-args: - - --share=ipc - - --share=network # Added for Internet access - - --socket=fallback-x11 - - --socket=wayland - - --device=dri - # Removed --filesystem=home for better security; add back only if strictly needed. - -modules: - - name: mzansi-innovation-hub - buildsystem: simple - sources: - - type: archive - url: https://git.mzansi-innovation-hub.co.za/yaso_meth/mih-project/releases/download/linux/mzansi_innovation_hub.tar.gz - sha256: b8c383f4d43e2de36b4e6520c9745e3f8e8618bdb9ef6024ad0bf260061137a9 - # If the tarball contains a top-level folder (like 'bundle'), - # flatpak-builder enters it automatically. - # If it doesn't, we use the commands below to find them. - - - type: file - path: za.co.mzansiinnovationhub.mih.desktop - - type: file - path: za.co.mzansiinnovationhub.mih.metainfo.xml - - type: file - path: za.co.mzansiinnovationhub.mih.png - - build-commands: - # 1. Create the necessary directories - - mkdir -p /app/bin /app/share/applications /app/share/icons/hicolor/256x256/apps /app/share/metainfo - - # 2. Move EVERYTHING from your archive into /app/bin/ - # We use 'find' to move only the app-related files and avoid the metadata files - - | - find . -mindepth 1 -maxdepth 2 \ - ! -name "*.desktop" \ - ! -name "*.xml" \ - ! -name "*.png" \ - ! -name "*.yml" \ - -exec cp -R -t /app/bin/ {} + - - # 3. Ensure the binary is in the right place and executable - # If the binary ended up in a subfolder, this moves it to the top of /app/bin - - find /app/bin -name "mzansi_innovation_hub" -type f -exec mv {} /app/bin/ \; - - chmod +x /app/bin/mzansi_innovation_hub - - # 4. Install Metadata (using the exact local files) - - install -Dm644 za.co.mzansiinnovationhub.mih.desktop /app/share/applications/za.co.mzansiinnovationhub.mih.desktop - - install -Dm644 za.co.mzansiinnovationhub.mih.png /app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png - - install -Dm644 za.co.mzansiinnovationhub.mih.metainfo.xml /app/share/metainfo/za.co.mzansiinnovationhub.mih.metainfo.xml \ No newline at end of file diff --git a/mih_ui/pubspec.lock b/mih_ui/pubspec.lock index 1401d55c..0271d47e 100644 --- a/mih_ui/pubspec.lock +++ b/mih_ui/pubspec.lock @@ -1212,10 +1212,10 @@ packages: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" mih_package_toolkit: dependency: "direct main" description: @@ -1977,10 +1977,10 @@ packages: dependency: transitive description: name: test_api - sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.11" timing: dependency: transitive description: @@ -2294,5 +2294,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.9.0 <3.13.0-z" + dart: ">=3.10.0-0 <3.13.0-z" flutter: ">=3.29.0"