Merge pull request #140 from geoCML/fonts

Install fonts to geoCML Desktop

Author: TristanDamron

Dockerfiles/Dockerfile.geocml-desktop

@@ -5,7 +5,7 @@ USER root
 WORKDIR /
 
 RUN apt update
-RUN apt install -y nix
+RUN apt install -y nix python3-pip
 
 RUN useradd -d /home/user -m user
 

Dockerfiles/Dockerfile.geocml-task-scheduler

@@ -1,23 +1,27 @@
 FROM  --platform=linux/amd64 ubuntu:22.04
 
 USER root
+WORKDIR /
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update
 RUN apt install -y software-properties-common
 RUN add-apt-repository ppa:deadsnakes/ppa && apt update
 RUN apt install -y nix python3.11 python3-pip python3.11-venv python3.11-dev
 
-ADD ./build-resources/geocml-task-scheduler/geocml-task-scheduler ./geocml-task-scheduler/geocml-task-scheduler/
+RUN mkdir ./geocml-task-scheduler/
 COPY ./build-resources/geocml-task-scheduler/make.sh ./make.sh
 
 RUN chmod +x ./make.sh
 RUN ./make.sh
 
+ADD ./build-resources/geocml-task-scheduler/geocml-task-scheduler ./geocml-task-scheduler/geocml-task-scheduler/
+
 ######### Customize Container Here ###########
 ######### End Customizations ###########
 
 RUN apt clean autoclean && apt autoremove -y && rm -rf /var/lib/{apt,dpkg,cache,log}/
 RUN nix-collect-garbage -d
+RUN rm ./make.sh
 
 COPY ./build-resources/geocml-task-scheduler/entrypoint.sh ./entrypoint.sh
 RUN chmod +x ./entrypoint.sh

build-resources/geocml-desktop/entrypoint.sh

@@ -3,5 +3,18 @@
 #! nix-shell -p qgis-ltr dbus
 #! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/tags/24.05.tar.gz
 
+pip3 install qgis-plugin-manager --user
+export PATH=/home/user/.local/bin:$PATH
+mkdir -p ~/.local/share/QGIS/QGIS3/profiles/default/python/plugins
+cd ~/.local/share/QGIS/QGIS3/profiles/default/python/plugins
+qgis-plugin-manager init
+qgis-plugin-manager update
+qgis-plugin-manager install "QRestart"
+
+cd ~
+mkdir ~/.fonts
+find /Persistence/Fonts/ -name '*.ttf' -exec cp {} ~/.fonts \; &
+fc-cache -f -v &
+
 xpra start :100 --start="qgis /Persistence/geocml-project.qgz" --bind-tcp=0.0.0.0:10000 --tcp-auth=env --no-daemon --no-notifications --no-mdns --no-pulseaudio
 

build-resources/geocml-task-scheduler/entrypoint.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash
-#! nix-shell -p postgresql
+#! nix-shell -p postgresql docker_26
 #! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/tags/24.05.tar.gz
 
 python3.11 -m pip install -r /geocml-task-scheduler/geocml-task-scheduler/requirements.txt

build-resources/geocml-task-scheduler/geocml-task-scheduler/schedule.py

@@ -1,20 +1,22 @@
 from task import Task
 from task_scheduler import TaskScheduler
-from backup_geocml_db import backup_geocml_db
-from restore_geocml_db_from_backups import restore_geocml_db_from_backups
-from register_with_drgon import register_with_drgon
+from tasks.backup_geocml_db import backup_geocml_db
+from tasks.restore_geocml_db_from_backups import restore_geocml_db_from_backups
+from tasks.register_with_drgon import register_with_drgon
+from tasks.refresh_font_cache import refresh_font_cache
 
 scheduler = TaskScheduler()
 
 # DEFINE TASKS HERE
 backup_geocml_db_task = Task(backup_geocml_db, ())
 restore_geocml_db_task = Task(restore_geocml_db_from_backups, ())
 register_with_drgon_task = Task(register_with_drgon, ())
+refresh_font_cache_task = Task(refresh_font_cache, ())
 
 # ADD TASKS TO SCHEDULER HERE
 scheduler.add(backup_geocml_db_task, 3600)  # task runs every hour
 scheduler.add(restore_geocml_db_task, 1)  # task runs every second until stopped
 scheduler.add(register_with_drgon_task, 60)
-
+scheduler.add(refresh_font_cache_task, 60)
 
 scheduler.tick()

build-resources/geocml-task-scheduler/geocml-task-scheduler/service_controller.py

@@ -0,0 +1,13 @@
+import subprocess
+from enum import Enum
+
+class ServiceController(object):
+    def restart_service(self, service):
+        return subprocess.run(["docker", "restart", f"{self.get_container_id(service)}"])
+
+    def get_container_id(self, service):
+        return subprocess.run(["docker", "ps", "-aqf", f"name={service}"], capture_output=True, text=True).stdout.split("\n")[0]
+
+    def run_command_sh(self, service, cmd):
+        # BE VERY CAREFUL WITH THIS METHOD! BAD THINGS COULD HAPPEN IF YOU ARE NOT.
+        return subprocess.run(f'docker exec {self.get_container_id(service)} sh -c "{cmd}"', capture_output=True, text=True, shell=True)

build-resources/geocml-task-scheduler/geocml-task-scheduler/backup_geocml_db.py renamed to build-resources/geocml-task-scheduler/geocml-task-scheduler/tasks/backup_geocml_db.py

@@ -0,0 +1,14 @@
+from task_logger import log
+from service_controller import ServiceController
+
+controller = ServiceController()
+def refresh_font_cache():
+    out = controller.run_command_sh("geocml-desktop", "find /Persistence/Fonts/ -name '*.ttf' -exec cp {} ~/.fonts \; &")
+    if out.stderr:
+        log(f"Failed to collect fonts from /Persistence/Fonts/: {out.stderr}")
+        return 0
+
+    out = controller.run_command_sh("geocml-desktop", "fc-cache -f -v &")
+    if out.stderr:
+        log(f"Failed to update font cache: {out.stderr}")
+        return 0