From 7f066d52b839baa5e5dee50cc0df6290ba0e25f0 Mon Sep 17 00:00:00 2001
From: mikoto <avdb@keemail.me>
Date: Mon, 12 Feb 2024 10:49:17 +0000
Subject: [PATCH 1/2] chore: make Docker environment easier to work with

---
 Justfile           | 8 ++++++--
 docker-compose.yml | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Justfile b/Justfile
index 8862dd0..57e8a42 100644
--- a/Justfile
+++ b/Justfile
@@ -29,6 +29,7 @@ nuke_db:
 # Generates the synapse configuration file and saves it
 gen_synapse_conf: dotenv
   docker run -i --rm \
+    -u $(id -u):$(id -g) \
     -v ./docker/synapse:/data \
     --env-file .env \
     matrixdotorg/synapse:v1.96.1 generate
@@ -37,6 +38,7 @@ gen_synapse_conf: dotenv
 gen_synapse_admin: dotenv
   docker compose exec -i synapse \
     register_new_matrix_user http://localhost:8008 \
+    -u $(id -u):$(id -g) \
     -c /data/homeserver.yaml \
     -u admin \
     -p admin \
@@ -44,8 +46,10 @@ gen_synapse_admin: dotenv
 
 # Retrieves admin access token uses de-facto admin user and Development Database Credentials
 get_access_token:
-  curl -sS -d '{"type":"m.login.password", "user":"admin", "password":"admin"}' \
-  http://localhost:8008/_matrix/client/v3/login | jq --raw-output '.access_token' > access_token.txt
+  sed -i "s/COMMUNE_SYNAPSE_ADMIN_TOKEN='.*'/COMMUNE_SYNAPSE_ADMIN_TOKEN='$( \
+    curl -sS -d '{"type":"m.login.password", "user":"admin", "password":"admin"}' \
+    http://localhost:8008/_matrix/client/v3/login | jq --raw-output '.access_token' \
+  )'/" .env
 
 # Runs backend dependency services
 backend: dotenv
diff --git a/docker-compose.yml b/docker-compose.yml
index a8ff934..1c558f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - '8001:8001'
     volumes:
       - redis-state:/data
-  
+
   synapse_database:
     image: 'postgres:16'
     ports:
@@ -27,6 +27,7 @@ services:
 
   synapse:
     image: 'ghcr.io/element-hq/synapse:v1.100.0'
+    user: '${UID:-1000}:${GID:-1000}'
     ports:
       - '8008:8008'
       - '8448:8448'

From dca3c2612a0a97fe9dccbb953a85b01af98cc92e Mon Sep 17 00:00:00 2001
From: mikoto <avdb@keemail.me>
Date: Mon, 12 Feb 2024 10:49:17 +0000
Subject: [PATCH 2/2] chore: make Docker environment easier to work with

---
 docker/synapse/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docker/synapse/.gitkeep

diff --git a/docker/synapse/.gitkeep b/docker/synapse/.gitkeep
new file mode 100644
index 0000000..e69de29