From 4baa0ae14b0fef3cadb409cb459b8784e37bfde8 Mon Sep 17 00:00:00 2001
From: Tristan Damron <tristandamron@protonmail.com>
Date: Wed, 14 Aug 2024 17:37:02 -0700
Subject: [PATCH] WIP

---
 .github/workflows/main.yml            | 18 +++++++++---------
 Dockerfiles/Dockerfile.geocml-desktop | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0dd49b1..9afb392 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,17 +6,17 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the develop branch
   push:
-    branches: [ main ]
+    branches: [main]
     paths-ignore:
-      - '.gitignore'
-      - 'LICENSE.md'
-      - 'README.md'
+      - ".gitignore"
+      - "LICENSE.md"
+      - "README.md"
   pull_request:
-    branches: [ main ]
+    branches: [main]
     paths-ignore:
-      - '.gitignore'
-      - 'LICENSE.md'
-      - 'README.md'
+      - ".gitignore"
+      - "LICENSE.md"
+      - "README.md"
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -27,7 +27,7 @@ jobs:
   build:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/Dockerfiles/Dockerfile.geocml-desktop b/Dockerfiles/Dockerfile.geocml-desktop
index 962ab28..dc6e4f2 100644
--- a/Dockerfiles/Dockerfile.geocml-desktop
+++ b/Dockerfiles/Dockerfile.geocml-desktop
@@ -1,17 +1,17 @@
 FROM ubuntu:22.04
 
+ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update
 
 RUN useradd -d /home/user -m user
 
 # Install xpra
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt install -y wget gnupg xvfb x11-xserver-utils python3 python3-pip \
- && pip3 install pyinotify \
- && echo "deb [arch=amd64] https://xpra.org/ focal main" > /etc/apt/sources.list.d/xpra.list \
- && wget -q https://xpra.org/gpg.asc -O- | apt-key add - \
- && apt update \
- && apt install -y xpra --no-install-recommends --no-install-suggests
+RUN apt install -y wget gnupg xvfb x11-xserver-utils python3 python3-pip
+RUN pip3 install pyinotify
+RUN echo "deb [arch=amd64] https://xpra.org/ focal main" > /etc/apt/sources.list.d/xpra.list
+RUN wget -q https://xpra.org/gpg.asc -O- | apt-key add -
+RUN apt update
+RUN apt install -y -f xpra --no-install-recommends --no-install-suggests
 
 # Install QGIS
 RUN apt install -y qgis