Differences

This shows you the differences between two versions of the page.

--- mastodon_upgrade [2023/10/07 17:11] – handle
+++ mastodon_upgrade [2023/10/07 17:21] – handle
@@ Line 9: / Line 9: @@
 ====== Build a new version ======
+  export NEW_VERSION=4.2.0  # change to actual new version
   git checkout trunk
   git fetch upstream --tags
-  git
+  git checkout -b merged-$NEW_VERSION
+  git merge v$NEW_VERSION
+  git checkout trunk
+  git merge merged-$NEW_VERSION
+  git push
+Then check [[https://gitlab.com/sunbeam.city/mastodon/-/jobs|the "Jobs" page on Gitlab]], and you should see the Docker image build happily running 🏃 It takes about 8 minutes.
 ====== Deploy the new version ======
+SSH to the server (arkology.sunbeam.city).
+Then run:
+  cd /var/services/mastodon
+  sudo -u services git pull
+  sudo docker-compose pull && \
+    sudo docker-compose down && \
+    sudo docker-compose up -d