From 30da923cbb38f63cdbe95d4592323793b34dcda9 Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <github@thisprops.com>
Date: Sun, 5 Feb 2023 11:10:49 +0100
Subject: [PATCH] refactor: adapt config to support arm64 and make app key
 generated

---
 apps/monica/config.json        | 15 +++++++++++++--
 apps/monica/docker-compose.yml | 16 +++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/apps/monica/config.json b/apps/monica/config.json
index 75a54d23..96136269 100644
--- a/apps/monica/config.json
+++ b/apps/monica/config.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../schema.json",
   "name": "Monica",
   "available": true,
   "exposable": true,
@@ -10,12 +11,14 @@
     "data",
     "social"
   ],
+  "supported_architectures": [
+    "amd64",
+    "arm64"
+  ]
   "description": "Monica is an open-source web application to organize and record your interactions with your loved ones. We call it a PRM, or Personal Relationship Management. Think of it as a CRM (a popular tool used by sales teams in the corporate world) for your friends or family.",
   "short_desc": "A Personal Relationship Management tool to help you document your social life.",
   "author": "monicahq",
   "source": "https://github.com/monicahq/monica",
-  "uid": 1000,
-  "gid": 1000,
   "form_fields": [
     {
       "type": "random",
@@ -24,6 +27,14 @@
       "min": 30,
       "max": 30,
       "env_variable": "MONICA_DB_PASS"
+    },
+    {
+      "type": "random",
+      "label": "Application key",
+      "required": false,
+      "min": 32,
+      "max": 32,
+      "env_variable": "MONICA_APP_KEY"
     }
   ]
 }
diff --git a/apps/monica/docker-compose.yml b/apps/monica/docker-compose.yml
index 85f03766..aa7e1f34 100644
--- a/apps/monica/docker-compose.yml
+++ b/apps/monica/docker-compose.yml
@@ -1,13 +1,14 @@
 version: "3.7"
 services:
   monica:
-    image: monica
+    image: monica:4.0.0
+    container_name: monica
     depends_on:
       - monica-db
     ports:
       - ${APP_PORT}:80
     environment:
-      - APP_KEY=f38f25083b2e64e2a673ade27d682359
+      - APP_KEY=${MONICA_APP_KEY}
       - DB_HOST=monica-db
       - DB_USERNAME=usermonica
       - DB_PASSWORD=${MONICA_DB_PASS}
@@ -25,13 +26,14 @@ services:
       traefik.http.services.monica.loadbalancer.server.port: 80
 
   monica-db:
-    image: mysql:5.7
+    image: mariadb:10.6.11
+    container_name: monica-db
     environment:
       - TZ=${TZ}
-      - MYSQL_RANDOM_ROOT_PASSWORD=true
-      - MYSQL_DATABASE=monica
-      - MYSQL_USER=usermonica
-      - MYSQL_PASSWORD=${MONICA_DB_PASS}
+      - MARIADB_RANDOM_ROOT_PASSWORD=true
+      - MARIADB_DATABASE=monica
+      - MARIADB_USER=usermonica
+      - MARIADB_PASSWORD=${MONICA_DB_PASS}
     volumes:
       - ${APP_DATA_DIR}/mysql:/var/lib/mysql
     restart: unless-stopped