From 32e33f3eea74fac5ba84e3182e576f5c98a48519 Mon Sep 17 00:00:00 2001 From: rouge13 Date: Tue, 5 May 2026 19:16:34 +0200 Subject: [PATCH] rework compose --- apps/romm/config.json | 4 +- apps/romm/docker-compose-exemple.json | 102 ++++++++++++++++++++++++++ apps/romm/docker-compose.json | 87 +++++++++++++++------- 3 files changed, 164 insertions(+), 29 deletions(-) create mode 100644 apps/romm/docker-compose-exemple.json diff --git a/apps/romm/config.json b/apps/romm/config.json index e441abe..c48e8a2 100644 --- a/apps/romm/config.json +++ b/apps/romm/config.json @@ -18,8 +18,8 @@ "amd64", "arm64" ], - "created_at": 1777996093090, - "updated_at": 1777996093090, + "created_at": 1778001367632, + "updated_at": 1778001367632, "dynamic_config": true, "min_tipi_version": "4.5.0" } diff --git a/apps/romm/docker-compose-exemple.json b/apps/romm/docker-compose-exemple.json new file mode 100644 index 0000000..71e6025 --- /dev/null +++ b/apps/romm/docker-compose-exemple.json @@ -0,0 +1,102 @@ +{ + "schemaVersion": 2, + "services": [ + { + "name": "romm", + "image": "rommapp/romm:latest", + "environment": [ + { + "key": "DB_HOST", + "value": "romm-db" + }, + { + "key": "DB_NAME", + "value": "romm" + }, + { + "key": "DB_USER", + "value": "romm-user" + }, + { + "key": "HASHEOUS_API_ENABLED", + "value": "true" + } + ], + "internalPort": 8080, + "volumes": [ + { + "hostPath": "romm_resources", + "containerPath": "/romm/resources", + "readOnly": false, + "shared": false, + "private": false + }, + { + "hostPath": "romm_redis_data", + "containerPath": "/redis-data", + "readOnly": false, + "shared": false, + "private": false + }, + { + "hostPath": "/path/to/library", + "containerPath": "/romm/library", + "readOnly": false, + "shared": false, + "private": false + }, + { + "hostPath": "/path/to/assets", + "containerPath": "/romm/assets", + "readOnly": false, + "shared": false, + "private": false + }, + { + "hostPath": "/path/to/config", + "containerPath": "/romm/config", + "readOnly": false, + "shared": false, + "private": false + } + ], + "dependsOn": { + "romm-db": { + "condition": "service_healthy", + "restart": true + } + } + }, + { + "name": "romm-db", + "image": "mariadb:latest", + "environment": [ + { + "key": "MARIADB_DATABASE", + "value": "romm" + }, + { + "key": "MARIADB_USER", + "value": "romm-user" + } + ], + "volumes": [ + { + "hostPath": "mysql_data", + "containerPath": "/var/lib/mysql", + "readOnly": false, + "shared": false, + "private": false + } + ], + "healthCheck": { + "test": "CMD healthcheck.sh --connect --innodb_initialized", + "interval": "10s", + "timeout": "5s", + "retries": 5, + "startPeriod": "30s", + "startInterval": "10s" + } + } + ] +} diff --git a/apps/romm/docker-compose.json b/apps/romm/docker-compose.json index 2668a97..32f56dc 100644 --- a/apps/romm/docker-compose.json +++ b/apps/romm/docker-compose.json @@ -5,16 +5,40 @@ "name": "romm", "image": "rommapp/romm:4.8.1", "isMain": true, - "internalPort": 1083, + "internalPort": 8080, "environment": [ - {"key": "ROMM_AUTH_SECRET_KEY", "value": "c1f031e363e92dd780d036930eb504d80b9db8db9bbaccb4d4c5de2a3a7d8fa7"}, - {"key": "SCREENSCRAPER_USER", "value": "rouge13@gmail.com"}, - {"key": "SCREENSCRAPER_PASSWORD", "value": "rscIo8urOgEWzh"}, - {"key": "DB_HOST", "value": "rommdb"}, - {"key": "DB_NAME", "value": "romm"}, - {"key": "DB_USER", "value": "romm-user"}, - {"key": "DB_PASSWD", "value": "vklsi6ez"}, - {"key": "DB_HOST", "value": "rommdb"} + { + "key": "ROMM_AUTH_SECRET_KEY", + "value": "c1f031e363e92dd780d036930eb504d80b9db8db9bbaccb4d4c5de2a3a7d8fa7" + }, + { + "key": "SCREENSCRAPER_USER", + "value": "rouge13@gmail.com" + }, + { + "key": "SCREENSCRAPER_PASSWORD", + "value": "rscIo8urOgEWzh" + }, + { + "key": "DB_HOST", + "value": "rommdb" + }, + { + "key": "DB_NAME", + "value": "romm" + }, + { + "key": "DB_USER", + "value": "romm-user" + }, + { + "key": "DB_PASSWD", + "value": "vklsi6ez" + }, + { + "key": "DB_HOST", + "value": "rommdb" + } ], "volumes": [ { @@ -39,21 +63,10 @@ "private": false } ], - "addPorts": [ - { - "containerPort": 8080, - "hostPort": 8080, - "tcp": true - }, - { - "containerPort": 8080, - "hostPort": 8080, - "udp": true - } - ], "depends0n": { "romm-db": { - "condition": "service_started" + "condition": "service_healthy", + "restart": true } } }, @@ -61,10 +74,22 @@ "name": "romm-db", "image": "mariadb:latest", "environment": [ - {"key": "MYSQL_ROOT_PASSWORD", "value": "kudsgqkdu"}, - {"key": "MYSQL_DATABASE", "value": "romm"}, - {"key": "MYSQL_USER", "value": "romm-user"}, - {"key": "MYSQL_PASSWORD", "value": "fvklsi6ez"} + { + "key": "MARIADB_DATABASE", + "value": "romm" + }, + { + "key": "MARIADB_USER", + "value": "romm-user" + }, + { + "key": "MARIADB_PASSWORD", + "value": "fvklsi6ez" + }, + { + "key": "MARIADB_ROOT_PASSWORD", + "value": "ksjfmlzkueg" + } ], "volumes": [ { @@ -74,7 +99,15 @@ "shared": false, "private": false } - ] + ], + "healthCheck": { + "test": "CMD healthcheck.sh --connect --innodb_initialized", + "interval": "10s", + "timeout": "5s", + "retries": 5, + "startPeriod": "30s", + "startInterval": "10s" + } } ] }