From 2e3a3c59c361476dcc47331ea3c8d1c1f0da599a Mon Sep 17 00:00:00 2001
From: Manuel <git@huesers.de>
Date: Sun, 2 Apr 2023 23:06:47 +0200
Subject: [PATCH] chore: gitattributes, README, Docker

* Add gitattributes
* Update README to include additional configuration instructions
* Update OBS app to use prebuilt Docker images
* Remove obsolete links attribute from compose files
* Use cage based image by default for OBS app
* Fix use of yaml anchors in compose files for new compose version
---
 .gitattributes           | 2 ++
 README.md                | 7 +++++--
 apps/obs/Dockerfile      | 2 +-
 apps/obs/Dockerfile.cage | 2 +-
 apps/obs/Dockerfile.sway | 2 +-
 apps/obs/compose.yml     | 2 --
 compose.yml              | 6 +-----
 7 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..94bf417
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto eol=lf
+Dockerfile.* linguist-language=Dockerfile
diff --git a/README.md b/README.md
index d87bb0f..893f2a0 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,13 @@ It should also ask you what domain Caddy should use to serve Guacamole on, it sh
 $ ./prepare.sh
 Domain Guacamole should be served on [localhost]: desktop.mydomain.com
 Preparing folder guacamole/init and creating guacamole/init/initdb.sql
-done
+Setting permissions for user directory (chown needs root)
+everything done
 ```
 
-After that you can already start the containers using `docker-compose up -d`
+After that you can already start the containers using `docker-compose -f compose.yml up -d` to create the network first and then optionally run `docker-compose up -d` to build and start the default OBS app container.
+
+Using the default guacamole credentials `guacadmin:guacadmin`, you can now create a connection using `obs:5900` as network parameters in `Settings > Connection > New Connection` with VNC as protocol.
 
 ## Config
 
diff --git a/apps/obs/Dockerfile b/apps/obs/Dockerfile
index 89d1c9e..6d3a122 120000
--- a/apps/obs/Dockerfile
+++ b/apps/obs/Dockerfile
@@ -1 +1 @@
-Dockerfile.sway
\ No newline at end of file
+Dockerfile.cage
\ No newline at end of file
diff --git a/apps/obs/Dockerfile.cage b/apps/obs/Dockerfile.cage
index 74b73b6..9eda75e 100644
--- a/apps/obs/Dockerfile.cage
+++ b/apps/obs/Dockerfile.cage
@@ -1,4 +1,4 @@
-FROM cagevnc:latest
+FROM git.snrd.eu/sunred/cagevnc:latest
 
 RUN pacman -Syu --noconfirm obs-studio \
  && yes y | pacman -Scc \
diff --git a/apps/obs/Dockerfile.sway b/apps/obs/Dockerfile.sway
index 4f44ee2..dbaa44b 100644
--- a/apps/obs/Dockerfile.sway
+++ b/apps/obs/Dockerfile.sway
@@ -1,4 +1,4 @@
-FROM swayvnc:latest
+FROM git.snrd.eu/sunred/swayvnc:latest
 
 RUN pacman -Syu --noconfirm obs-studio \
  && yes y | pacman -Scc \
diff --git a/apps/obs/compose.yml b/apps/obs/compose.yml
index 6287adc..ad4eb54 100644
--- a/apps/obs/compose.yml
+++ b/apps/obs/compose.yml
@@ -16,8 +16,6 @@ services:
     container_name: obs-studio
     pull_policy: never
     hostname: $HOSTNAME
-    links:
-      - guacd
     volumes:
       - ./user:/home/nobody
     devices:
diff --git a/compose.yml b/compose.yml
index 41d484f..a73ffef 100644
--- a/compose.yml
+++ b/compose.yml
@@ -4,8 +4,7 @@ x-restart-policy: &restart_policy
 x-pull-policy: &pull_policy
   pull_policy: always
 x-compose-defaults: &compose_defaults
-  <<: *restart_policy
-  <<: *pull_policy
+  <<: [*restart_policy, *pull_policy]
   networks:
     desktop:
 
@@ -37,9 +36,6 @@ services:
     depends_on:
       - guacd
       - postgres
-    links:
-      - guacd
-      - postgres
     environment:
       GUACD_HOSTNAME: guacd
       EXTENSIONS: auth-totp