From 66a7bb82e2176443e1c9f161c50de31df8e3b487 Mon Sep 17 00:00:00 2001 From: alexz Date: Thu, 20 Aug 2026 23:11:36 -0700 Subject: [PATCH] mergedrop: bump to 1.0.1, rebuild from vid-merger source; fix stale source repo URL in build.sh - config.json: tipi_version 1->2, version 1.0.0->1.0.1, updated_at bumped; added missing required fields supported_architectures (["amd64"]) and dynamic_config (true) so the app passes schema validation - docker-compose.json: main service image mergedrop:1.0.0 -> mergedrop:1.0.1 - build/build.sh: default IMAGE_TAG 1.0.0 -> 1.0.1; default SOURCE_REPO corrected from stale video-merger.git to vid-merger.git - build/README.md: corrected source repo pointer from video-merger to vid-merger Image git.alexzaw.dev/alexz/mergedrop:1.0.1 is being built from git.alexzaw.dev/alexz/vid-merger @ 9b27376 in a separate process. Deploy chain (appstore update / app update) to be run separately once the image build completes. --- apps/mergedrop/build/README.md | 2 +- apps/mergedrop/build/build.sh | 4 ++-- apps/mergedrop/config.json | 9 ++++++--- apps/mergedrop/docker-compose.json | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/mergedrop/build/README.md b/apps/mergedrop/build/README.md index 8eb5686..3296890 100644 --- a/apps/mergedrop/build/README.md +++ b/apps/mergedrop/build/README.md @@ -2,7 +2,7 @@ The Dockerfile and full source for the **MergeDrop** image live in a separate Gitea repo: -- Source: +- Source: - Published image: `git.alexzaw.dev/alexz/mergedrop:` This folder holds only a thin helper script (`build.sh`) that clones the source diff --git a/apps/mergedrop/build/build.sh b/apps/mergedrop/build/build.sh index 21d6483..eeba2b8 100755 --- a/apps/mergedrop/build/build.sh +++ b/apps/mergedrop/build/build.sh @@ -6,8 +6,8 @@ set -euo pipefail IMAGE_NAME="${IMAGE_NAME:-git.alexzaw.dev/alexz/mergedrop}" -IMAGE_TAG="${IMAGE_TAG:-1.0.0}" -SOURCE_REPO="${SOURCE_REPO:-https://git.alexzaw.dev/alexz/video-merger.git}" +IMAGE_TAG="${IMAGE_TAG:-1.0.1}" +SOURCE_REPO="${SOURCE_REPO:-https://git.alexzaw.dev/alexz/vid-merger.git}" WORKDIR="${WORKDIR:-/tmp/mergedrop-build}" echo "==> Preparing source at ${WORKDIR}" diff --git a/apps/mergedrop/config.json b/apps/mergedrop/config.json index 542cc00..0d04b3c 100644 --- a/apps/mergedrop/config.json +++ b/apps/mergedrop/config.json @@ -7,8 +7,10 @@ "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": 1, - "version": "1.0.0", + "tipi_version": 2, + "version": "1.0.1", + "dynamic_config": true, + "supported_architectures": ["amd64"], "categories": ["media", "utilities"], "short_desc": "Drag, sort, merge — your videos into one MP4.", "author": "MergeDrop", @@ -28,5 +30,6 @@ "required": false, "env_variable": "MERGEDROP_MAX_FILE_SIZE" } - ] + ], + "updated_at": 1787292618234 } diff --git a/apps/mergedrop/docker-compose.json b/apps/mergedrop/docker-compose.json index b8f87d4..7a1d4e4 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.0", + "image": "git.alexzaw.dev/alexz/mergedrop:1.0.1", "isMain": true, "internalPort": 8000, "environment": [