diff --git a/apps/mergedrop/build/build.sh b/apps/mergedrop/build/build.sh index eeba2b8..8ad3c01 100755 --- a/apps/mergedrop/build/build.sh +++ b/apps/mergedrop/build/build.sh @@ -6,7 +6,7 @@ set -euo pipefail IMAGE_NAME="${IMAGE_NAME:-git.alexzaw.dev/alexz/mergedrop}" -IMAGE_TAG="${IMAGE_TAG:-1.0.1}" +IMAGE_TAG="${IMAGE_TAG:-1.0.2}" SOURCE_REPO="${SOURCE_REPO:-https://git.alexzaw.dev/alexz/vid-merger.git}" WORKDIR="${WORKDIR:-/tmp/mergedrop-build}" diff --git a/apps/mergedrop/config.json b/apps/mergedrop/config.json index 0d04b3c..b53459a 100644 --- a/apps/mergedrop/config.json +++ b/apps/mergedrop/config.json @@ -7,14 +7,14 @@ "port": 8765, "id_name": "mergedrop", "description": "Self-hosted drag-and-drop video merger. Drop clips, reorder, and build a single MP4 with ffmpeg.", - "tipi_version": 2, - "version": "1.0.1", + "tipi_version": 3, + "version": "1.0.2", "dynamic_config": true, "supported_architectures": ["amd64"], "categories": ["media", "utilities"], "short_desc": "Drag, sort, merge — your videos into one MP4.", "author": "MergeDrop", - "source": "https://git.alexzaw.dev/alexz/video-merger", + "source": "https://git.alexzaw.dev/alexz/vid-merger", "form_fields": [ { "type": "text", @@ -31,5 +31,5 @@ "env_variable": "MERGEDROP_MAX_FILE_SIZE" } ], - "updated_at": 1787292618234 + "updated_at": 1787292951819 } diff --git a/apps/mergedrop/docker-compose.json b/apps/mergedrop/docker-compose.json index 7a1d4e4..9833ddf 100644 --- a/apps/mergedrop/docker-compose.json +++ b/apps/mergedrop/docker-compose.json @@ -4,7 +4,7 @@ "services": [ { "name": "mergedrop", - "image": "git.alexzaw.dev/alexz/mergedrop:1.0.1", + "image": "git.alexzaw.dev/alexz/mergedrop:1.0.2", "isMain": true, "internalPort": 8000, "environment": [ @@ -16,7 +16,9 @@ { "key": "MERGEDROP_MAX_FILES", "value": "${MERGEDROP_MAX_FILES}" }, { "key": "MERGEDROP_MAX_FILE_SIZE", "value": "${MERGEDROP_MAX_FILE_SIZE}" }, { "key": "MERGEDROP_OUTPUT_MAX_AGE_HOURS", "value": "${MERGEDROP_OUTPUT_MAX_AGE_HOURS}" }, - { "key": "CORS_ORIGINS", "value": "*" } + { "key": "CORS_ORIGINS", "value": "*" }, + { "key": "MONGO_URL", "value": "mongodb://mergedrop-db:27017" }, + { "key": "DB_NAME", "value": "mergedrop" } ], "volumes": [ { @@ -41,6 +43,27 @@ "timeout": "5s", "retries": 3, "startPeriod": "20s" + }, + "dependsOn": { + "mergedrop-db": { "condition": "service_healthy" } + } + }, + { + "name": "mergedrop-db", + "image": "mongo:7.0", + "volumes": [ + { + "hostPath": "${APP_DATA_DIR}/db", + "containerPath": "/data/db", + "readOnly": false + } + ], + "healthCheck": { + "test": "mongosh --quiet --eval \"db.adminCommand('ping')\"", + "interval": "10s", + "timeout": "5s", + "retries": 5, + "startPeriod": "20s" } } ]