From 827366383950d9b45f73dea01b337de0037c0f3c Mon Sep 17 00:00:00 2001
From: Benoit <forgejo@benoit.jp.net>
Date: Mon, 10 Feb 2025 21:37:43 +0900
Subject: [PATCH] Forgejo: Bump to 10.0.1

---
 cfg/jobs/forgejo.run                     |  2 +-
 run/adguard/workspace/adguard.service    |  6 ++++--
 run/mastodon/workspace/setup_mastodon.sh | 12 ++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/cfg/jobs/forgejo.run b/cfg/jobs/forgejo.run
index 1c78e19..a4ba8d7 100755
--- a/cfg/jobs/forgejo.run
+++ b/cfg/jobs/forgejo.run
@@ -7,7 +7,7 @@ DIST="${IMAGE%%/*}"
 VER="${IMAGE#*/}"
 VER="${VER%/*}"
 VER="${VER//./-}"
-UPSTREAM_VER="9.0.1"
+UPSTREAM_VER="10.0.1"
 UPSTREAM_VER_DASH="${UPSTREAM_VER//./-}"
 UPSTREAM_NAME="forgejo"
 SERIAL="1benoitjpnet"
diff --git a/run/adguard/workspace/adguard.service b/run/adguard/workspace/adguard.service
index 535e668..9951bee 100644
--- a/run/adguard/workspace/adguard.service
+++ b/run/adguard/workspace/adguard.service
@@ -6,8 +6,10 @@ After=syslog.target network-online.target
 
 [Service]
 ExecStartPre=+/usr/sbin/setcap "CAP_NET_BIND_SERVICE=+eip CAP_NET_RAW=+eip" /opt/adguard/AdGuardHome
-# First run must run as root, then chown -R adguard: /etc/adguard /opt/adguard
-# And uncomment + restart service
+ExecStartPre=+/usr/sbin/chown -R adguard:adguard /etc/adguard /opt/adguard
+ExecStartPost=+/usr/sbin/chown -R adguard:adguard /etc/adguard /opt/adguard
+# First run must run as root
+# And uncomment + restart service after first init
 #User=adguard
 #Group=adguard
 StartLimitInterval=5
diff --git a/run/mastodon/workspace/setup_mastodon.sh b/run/mastodon/workspace/setup_mastodon.sh
index 179a1b7..555a21a 100644
--- a/run/mastodon/workspace/setup_mastodon.sh
+++ b/run/mastodon/workspace/setup_mastodon.sh
@@ -10,6 +10,8 @@ git clone https://github.com/rbenv/rbenv.git ~/.rbenv
   echo 'export PATH="$HOME/.rbenv/bin:$PATH"'
   # shellcheck disable=SC2016
   echo 'eval "$(rbenv init -)"'
+  # shellcheck disable=SC2016
+  echo 'export RAILS_ENV=production'
 } | tee -a ~/.bashrc ~/.profile
 # shellcheck disable=SC1090
 source ~/.profile
@@ -21,3 +23,13 @@ bundle install -j"$(getconf _NPROCESSORS_ONLN)"
 yarn install
 # Next steps are manual when container is started for the first time
 # https://docs.joinmastodon.org/admin/install/#generating-a-configuration
+
+# If upgrading from a previous image, just need to precompile assets:
+# cd live; RAILS_ENV=production bin/rails assets:precompile
+# cd /tmp; sudo -u postgres pg_dump -d mastodon_production -F c -f mastodon_production_backup.dump
+# incus file pull mastodon/tmp/mastodon_production_backup.dump /tmp/
+# incus file push /tmp/mastodon_production_backup.dump mastodon2/tmp/
+# incus shell mastodon2
+# sudo -u postgres createdb mastodon_production
+# sudo -u postgres pg_restore -d mastodon_production -F c /tmp/mastodon_production_backup.dump
+# tootctl feeds build