From c03b77ff82c34dae15458f4ddfc7e19aa690d9d9 Mon Sep 17 00:00:00 2001
From: Amras <amras@ciaszczyk.pl>
Date: Thu, 11 Jun 2026 08:14:48 +0000
Subject: [PATCH 1/2] Bump hometown version, split image

Follows the split detailed here:
https://github.com/mastodon/mastodon/releases/tag/v4.3.0
Streaming is now a separate image, sidekiq and app should
still use the main image.
---
 .drone.yml | 17 ++++++++++++++---
 README.md  |  4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0e9f6bf..a90b9d1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,11 +5,11 @@ steps:
   - name: download hometown code
     image: alpine/curl:8.1.2
     commands:
-      - curl -L -o hometown.tar.gz https://github.com/hometown-fork/hometown/archive/refs/tags/v4.2.17+hometown-1.1.2.tar.gz
+      - curl -L -o hometown.tar.gz https://github.com/hometown-fork/hometown/archive/refs/tags/v4.5.6+hometown-1.2.0.tar.gz
       - "tar -zxvf hometown.tar.gz"
       - "rm hometown.tar.gz"
       - "mv hometown-* hometown"
-  - name: build and publish
+  - name: build and publish main image
     image: plugins/docker
     settings:
       dockerfile: hometown/Dockerfile
@@ -18,5 +18,16 @@ steps:
       password:
         from_secret: git_coopcloud_tech_token_3wc
       repo: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown
-      tags: v4.2.17-hometown-1.1.2
+      tags: v4.5.6-hometown-1.2.0
+      registry: git.coopcloud.tech
+  - name: build and publish streaming server image
+    image: plugins/docker
+    settings:
+      dockerfile: hometown/streaming/Dockerfile
+      context: hometown
+      username: 3wordchant
+      password:
+        from_secret: git_coopcloud_tech_token_3wc
+      repo: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown
+      tags: v4.5.6-hometown-1.2.0-streaming
       registry: git.coopcloud.tech
diff --git a/README.md b/README.md
index 11440f4..f735bbe 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ See [`.drone.yml`](./.drone.yml)
 ## Releasing a new image
 
 1. Look up the latest verion number from https://github.com/hometown-fork/hometown/releases
-2. Edit the URL in [`.drone.yml`](./.drone.yml) to point to the new release and edit `tags` with the new version number
+2. Edit the URL in [`.drone.yml`](./.drone.yml) to point to the new release and edit `tags` with the new version number, both for the main image and the streaming server image.
 3. Commit and push
 4. Wait for the build to finish
-5. Run `abra recipe upgrade` etc. as normal
\ No newline at end of file
+5. Run `abra recipe upgrade` etc. as normal
-- 
2.49.0


From 141f8e39a1d7eee2afc36ba7c3c98f3471c5e1d0 Mon Sep 17 00:00:00 2001
From: Amras <amras@ciaszczyk.pl>
Date: Thu, 11 Jun 2026 17:02:00 +0000
Subject: [PATCH 2/2] update build.sh to split images

Since mastodon 4.5.x uses a second image,
the build.sh needed some love to build both of them.
---
 build.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/build.sh b/build.sh
index 0aa9ce9..7c5db46 100755
--- a/build.sh
+++ b/build.sh
@@ -1,20 +1,23 @@
 #!/bin/bash
 
 if ! type yq; then
-	echo "$(tput setaf 1)\`yq\` is not availble, please install from https://github.com/mikefarah/yq"
+	echo "$(tput setaf 1)\`yq\` is not availble, please install version 4.x from https://github.com/mikefarah/yq"
 	exit 1
 fi
 
-eval "$(yq  '.steps.[0].commands[]' < .drone.yml)"
+eval "$(yq '.steps.[0].commands[]' < .drone.yml)"
 
-TAG="$(yq  '.steps.[1].settings.tags' < .drone.yml)"
+for i in {1..2}
+do (
+	TAG="$(yq ".steps.[$i].settings.tags" < .drone.yml)"
+	CONTEXT="$(yq ".steps.[$i].settings.context" < .drone.yml)"
+	DOCKERFILE="$(yq ".steps.[$i].settings.dockerfile" < .drone.yml)"
+	REPO="$(yq ".steps.[$i].settings.repo" < .drone.yml)"
 
-( 
-	cd hometown || return 1
-
-	docker build -t "git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:$TAG" .
+	docker build -t "$REPO:$TAG" -f "$DOCKERFILE" "$CONTEXT"
+	docker push "$REPO:$TAG"
 )
+done
 
 rm -r hometown
 
-docker push "git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:$TAG"
-- 
2.49.0