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

@@ -0,0 +1,2 @@
+* text=auto eol=lf
+Dockerfile.* linguist-language=Dockerfile

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
 

apps/obs/Dockerfile

@@ -1 +1 @@
-Dockerfile.sway
+Dockerfile.cage

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 \

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 \

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:

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
+  <<: [*restart_policy, *pull_policy]
-  <<: *pull_policy
   networks:
     desktop:
 
@@ -37,9 +36,6 @@ services:
     depends_on:
       - guacd
       - postgres
-    links:
-      - guacd
-      - postgres
     environment:
       GUACD_HOSTNAME: guacd
       EXTENSIONS: auth-totp