4 files changed, 20 insertions, 7 deletions

diff --git a/Dockerfile b/Dockerfile
index 68d847a69..78e4daf9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -127,6 +127,9 @@ ENV BIND="0.0.0.0"
 
 USER mastodon
 
+ARG SOURCE_COMMIT
+ENV SOURCE_TAG $SOURCE_COMMIT
+
 # Precompile assets
 RUN cd ~ && OTP_SECRET=_ SECRET_KEY_BASE=_ rails assets:precompile --trace && yarn cache clean
 
diff --git a/README.md b/README.md
index 30f860768..502e0d8db 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ![Mastodon](https://i.imgur.com/NhZc40l.png)
 ========
 
-![Build Status](https://img.shields.io/docker/cloud/build/pluralcafe/mastodon) ![Site Status](https://img.shields.io/website?label=plural.cafe&logo=mastodon&url=https%3A%2F%2Fplural.cafe)
+[![Build Status](https://img.shields.io/docker/cloud/build/pluralcafe/mastodon)](https://hub.docker.com/repository/docker/pluralcafe/mastodon) [![Site Status](https://img.shields.io/website?label=plural.cafe&logo=mastodon&url=https%3A%2F%2Fplural.cafe)](https://plural.cafe)
 
 Mastodon is a **free, open-source social network server** based on **open web protocols** like ActivityPub and OStatus. The social focus of the project is a viable decentralized alternative to commercial social media silos that returns the control of the content distribution channels to the people. The technical focus of the project is a good user interface, a clean REST API for 3rd party apps and robust anti-abuse tools.
 
@@ -23,8 +23,11 @@ This instance is a fork of a fork: this has the [Mastodon Glitch Edition](https:
 
 ---
 
-## Changes from Upstream
+## Notable changes from upstream
 
-* 2126fd0cd tweak to ordered list display
-* 3de0fecfa support summary/details HTML
-* cb7608c37 allow gemini protocol links
\ No newline at end of file
+See output of `git log glitch..main --oneline | grep -v '[mM]erge' | less` for a (more) complete history.
+
+* <ol> margin issue fixed so numbered lists aren't cut off a few pixels shy of 1 number
+* HTML summary/details tags are allowed in toots
+* gemini protocol links are supported (not yet supported: automatically marking gemini:// text as links)
+* authentication required for account api endpoints to block some naive scrapers
diff --git a/hooks/build b/hooks/build
new file mode 100755
index 000000000..4f7259bec
--- /dev/null
+++ b/hooks/build
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+echo "Building from ${SOURCE_COMMIT}"
+docker build --build-arg SOURCE_COMMIT=`head -c 7 <<< $SOURCE_COMMIT` -t $IMAGE_NAME .
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index fa85f8e37..e745ed2d4 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -21,7 +21,11 @@ module Mastodon
     end
 
     def suffix
-      '+glitch'
+      if source_tag
+        "+cafe.#{source_tag}"
+      else
+        "+cafe"
+      end
     end
 
     def to_a
@@ -33,7 +37,7 @@ module Mastodon
     end
 
     def repository
-      ENV.fetch('GITHUB_REPOSITORY') { 'glitch-soc/mastodon' }
+      ENV.fetch('GITHUB_REPOSITORY') { 'pluralcafe/mastodon' }
     end
 
     def source_base_url