From f6a0dacf4fc1a91dc4f6db35e8a99248e1d85cf5 Mon Sep 17 00:00:00 2001
From: Benoit <forgejo@benoit.jp.net>
Date: Thu, 14 Nov 2024 20:41:33 +0900
Subject: [PATCH 1/3] Remove wrong comment

---
 cfg/scripts/wait_network | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cfg/scripts/wait_network b/cfg/scripts/wait_network
index a31f043..36725f8 100755
--- a/cfg/scripts/wait_network
+++ b/cfg/scripts/wait_network
@@ -1,5 +1,4 @@
 #!/bin/env bash
-# Upstream doc: https://www.navidrome.org/docs/installation/linux/
 set -euxo pipefail
 
 CNAME="$1"

From ce00f97cbea95dccafebf7fbc1b4aab3ec7062c9 Mon Sep 17 00:00:00 2001
From: Benoit <forgejo@benoit.jp.net>
Date: Thu, 14 Nov 2024 21:33:17 +0900
Subject: [PATCH 2/3] Use incus_publish job

---
 cfg/jobs/mastodon.run | 38 ++++++++------------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/cfg/jobs/mastodon.run b/cfg/jobs/mastodon.run
index 00c5253..f9be733 100755
--- a/cfg/jobs/mastodon.run
+++ b/cfg/jobs/mastodon.run
@@ -17,7 +17,7 @@ ALIAS="$UPSTREAM_NAME-$UPSTREAM_VER-$SERIAL"
 cd "$WORKSPACE"
 incus launch images:$IMAGE "$CNAME" --quiet
 
-wait_network $CNAME
+wait_network "$CNAME"
 
 # Mastodon
 incus exec "$CNAME" -- bash -c '
@@ -40,32 +40,10 @@ incus exec "$CNAME" \
   --force-noninteractive \
   -- bash /tmp/setup_mastodon.sh
 
-# Clean
-incus exec "$CNAME" -- \
-  rm -rf \
-    /etc/machine-id \
-    /var/cache/apt \
-    /var/log/journal
-
-# Publish
-incus stop "$CNAME"
-incus config metadata show "$CNAME" > "$ARCHIVE"/metadata.yaml
-# Get the current Unix timestamp
-current_timestamp=$(date +%s)
-# Calculate expiry date as current timestamp + 1 week (604800 seconds)
-expiry_date=$((current_timestamp + 604800))
-# Update metadata values
-sed -i \
-  -e "s/creation_date: .*/creation_date: $current_timestamp/" \
-  -e "s/expiry_date: .*/expiry_date: $expiry_date/" \
-  -e "s#description: .*#description: $UPSTREAM_NAME v$UPSTREAM_VER on $IMAGE release $SERIAL#" \
-  -e "s/name: .*/name: $CNAME/" \
-  -e "s/serial: .*/serial: $SERIAL/" \
-  "$ARCHIVE"/metadata.yaml
-
-incus config metadata edit "$CNAME" < "$ARCHIVE"/metadata.yaml
-incus publish "$CNAME" \
-  --alias $ALIAS \
-  --public \
-  --quiet
-incus rm "$CNAME"
+laminarc run incus_publish \
+  CNAME="$CNAME" \
+  UPSTREAM=$UPSTREAM_NAME \
+  UPSTREAM_VER=$UPSTREAM_VER \
+  IMAGE=$IMAGE \
+  SERIAL=$SERIAL \
+  ALIAS=$ALIAS

From 887f614e204287fe215fe7ba94e8f9adbc2496c4 Mon Sep 17 00:00:00 2001
From: Benoit <forgejo@benoit.jp.net>
Date: Thu, 14 Nov 2024 21:34:38 +0900
Subject: [PATCH 3/3] Forgejo: Use incus_publish job

---
 cfg/jobs/forgejo.run | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/cfg/jobs/forgejo.run b/cfg/jobs/forgejo.run
index 98ef790..6408343 100755
--- a/cfg/jobs/forgejo.run
+++ b/cfg/jobs/forgejo.run
@@ -50,29 +50,10 @@ incus exec $CNAME -- \
   https://codeberg.org/forgejo/forgejo/raw/branch/forgejo/contrib/systemd/forgejo.service
 #incus file push setup.sh $CNAME/usr/local/bin/
 
-# Clean
-incus exec $CNAME -- \
-  rm -rf \
-  /etc/machine-id \
-  /var/cache/apt \
-  /var/log/journal
-
-# Publish
-incus stop $CNAME
-incus config metadata show $CNAME > $ARCHIVE/metadata.yaml
-# Get the current Unix timestamp
-current_timestamp=$(date +%s)
-# Calculate expiry date as current timestamp + 1 week (604800 seconds)
-expiry_date=$(($current_timestamp + 604800))
-# Update metadata values
-sed -i \
-  -e "s/creation_date: .*/creation_date: $current_timestamp/" \
-  -e "s/expiry_date: .*/expiry_date: $expiry_date/" \
-  -e "s#description: .*#description: $UPSTREAM_NAME v$UPSTREAM_VER on $IMAGE release $SERIAL#" \
-  -e "s/name: .*/name: $CNAME/" \
-  -e "s/serial: .*/serial: $SERIAL/" \
-  $ARCHIVE/metadata.yaml
-
-incus config metadata edit $CNAME < $ARCHIVE/metadata.yaml
-incus publish $CNAME --alias $ALIAS --public --quiet
-incus rm $CNAME
+laminarc run incus_publish \
+  CNAME="$CNAME" \
+  UPSTREAM=$UPSTREAM_NAME \
+  UPSTREAM_VER=$UPSTREAM_VER \
+  IMAGE=$IMAGE \
+  SERIAL=$SERIAL \
+  ALIAS=$ALIAS