From 18b885ee3a20c02f5be41d6a04c910175ab00f54 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 11 Nov 2021 14:00:30 +0100
Subject: [PATCH 1/3] Fix "bundle exec rails mastodon:setup" crashing in some
 circumstances (#16976)

Fix regression from #16896
---
 lib/tasks/mastodon.rake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 9146f78e1..d905a07da 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -350,11 +350,11 @@ namespace :mastodon do
           end
         end.join("\n")
 
-        generated_header = "# Generated with mastodon:setup on #{Time.now.utc}\n\n"
+        generated_header = "# Generated with mastodon:setup on #{Time.now.utc}\n\n".dup
 
         if incompatible_syntax
-          generated_header << "Some variables in this file will be interpreted differently whether you are\n"
-          generated_header << "using docker-compose or not.\n\n"
+          generated_header << "# Some variables in this file will be interpreted differently whether you are\n"
+          generated_header << "# using docker-compose or not.\n\n"
         end
 
         File.write(Rails.root.join('.env.production'), "#{generated_header}#{env_contents}\n")

From e510302a7ccd3fe78327d0f1aeaaec65ddfd269d Mon Sep 17 00:00:00 2001
From: Yusuke Nakamura <unasuke@users.noreply.github.com>
Date: Fri, 12 Nov 2021 13:18:29 +0900
Subject: [PATCH 2/3] Build container image by GitHub Actions (#16973)

* Build container image by GitHub Actions

* Trigger docker build only pushed to main branch

* Tweak tagging imgae

- "edge" is the main branch
- "latest" is the tagged latest release
---
 .github/workflows/build-image.yml | 34 +++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/workflows/build-image.yml

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
new file mode 100644
index 000000000..2ec6b3d4b
--- /dev/null
+++ b/.github/workflows/build-image.yml
@@ -0,0 +1,34 @@
+name: Build container image
+on:
+  push:
+    branches:
+      - "main"
+    tags:
+      - "*"
+jobs:
+  build-image:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - uses: docker/metadata-action@v3
+        id: meta
+        with:
+          images: ghcr.io/${{ github.repository_owner }}/mastodon
+          flavor: |
+            latest=true
+          tags: |
+            type=edge,branch=main
+            type=semver,pattern={{ raw }}
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/mastodon:latest
+          cache-to: type=inline

From d3e1b5ab31c4a00e3c11d6d527ee36b6483010b3 Mon Sep 17 00:00:00 2001
From: tykayn <contact@cipherbliss.com>
Date: Sun, 21 Nov 2021 15:58:50 +0100
Subject: [PATCH 3/3] fix alt site title on auth

---
 app/views/layouts/auth.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index e8e24beec..613128112 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -12,7 +12,7 @@
         %h2.title.is-2
           = t('auth.login')
 
-        = image_tag asset_pack_path('media/images/bliss/login.jpg'), alt: @instance_presenter.site_title
+        = image_tag asset_pack_path('media/images/bliss/login.jpg'), alt: 'Mastodon Bliss'
 
       .form-container
         = render 'flashes'