From 59c14cbb7049da79ca5873856bec1a54be2c58cf Mon Sep 17 00:00:00 2001
From: Ftonans <>
Date: Wed, 2 Oct 2024 16:48:27 +0300
Subject: [PATCH 1/3] Add dumb.bloat.cat, reformat README.md

---
 README.md      | 19 ++++++++++---------
 instances.json |  5 +++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index a4120b3..d62df55 100644
--- a/README.md
+++ b/README.md
@@ -25,15 +25,16 @@ make build
 - Genius servers are behind a Cloudflare reverse proxy, which means certain IPs won't be able to send requests, to partially mitigate this, you can specify a proxy by setting the `PROXY` variable (must be a valid URI).
 
 ## Public Instances
-| URL                                           | Tor                                                                               | I2P                                                                        | Region | CDN? | Operator               
-| ---                                           | ---                                                                               | ---                                                                        | ---    | ---  | ---                    
-| <https://dumb.ducks.party>                    | No                                                                                | No                                                                         | NL     | No   | https://ducks.party 
-| <https://dumb.privacydev.net>                 | [Yes](http://dumb.g4c3eya4clenolymqbpgwz3q3tawoxw56yhzk4vugqrl6dtu3ejvhjid.onion) | No                                                                         | FR     | No   | https://privacydev.net
-| <https://dumb.hyperreal.coffee>               | No                                                                                | No                                                                         | US     | No   | https://hyperreal.coffee
-| <https://dm.vern.cc>                          | [Yes](http://dm.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion)   | [Yes](http://vernxpcpqi2y4uhu7to4rnjmyjjgzh3x3qxyzpmkhykefchkmleq.b32.i2p) | US     | No   | https://vern.cc        
-| <https://dumb.lunar.icu>                      | No                                                                                | No                                                                         | DE     | Yes  | @MaximilianGT500       
-| <https://dumb.privacyfucking.rocks>           | No                                                                                | No                                                                         | DE     | -    | https://privacyfucking.rocks |
-| <https://sing.whatever.social>                | No                                                                                | No                                                                         | US/DE  | Yes  | Whatever Social        
+| URL | Tor | I2P | Region | CDN? | Operator |
+| --- | :----: | :----: | :----: | :----: | --- |
+| <https://dumb.ducks.party> | No | No | NL | No | https://ducks.party |
+| <https://dumb.privacydev.net> | [Yes](http://dumb.g4c3eya4clenolymqbpgwz3q3tawoxw56yhzk4vugqrl6dtu3ejvhjid.onion) | No | FR | No | https://privacydev.net |
+| <https://dumb.hyperreal.coffee> | No | No | US | No | https://hyperreal.coffee |
+| <https://dm.vern.cc> | [Yes](http://dm.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion) | [Yes](http://vernxpcpqi2y4uhu7to4rnjmyjjgzh3x3qxyzpmkhykefchkmleq.b32.i2p) | US | No | https://vern.cc |
+| <https://dumb.lunar.icu> | No | No | DE | Yes | @MaximilianGT500 |
+| <https://dumb.privacyfucking.rocks> | No | No | DE | - | https://privacyfucking.rocks |
+| <https://sing.whatever.social> | No | No | US/DE | Yes | Whatever Social |
+| <https://dumb.bloat.cat> | No | No | DE | Yes | https://bloat.cat |
 
 [Status Page](https://github.com/rramiachraf/dumb-instances)
 
diff --git a/instances.json b/instances.json
index 96c5e0b..8e6af2a 100644
--- a/instances.json
+++ b/instances.json
@@ -31,5 +31,10 @@
         "clearnet": "https://dumb.privacyfucking.rocks/",
         "country": "DE",
         "cdn": false
+    },
+    {
+        "clearnet": "https://dumb.bloat.cat/",
+        "country": "DE",
+        "cdn": false
     }
 ]

From 40849d05578cc74a8f49632bee2920f4a979e033 Mon Sep 17 00:00:00 2001
From: rramiachraf <51409801+rramiachraf@users.noreply.github.com>
Date: Fri, 4 Oct 2024 23:32:59 +0100
Subject: [PATCH 2/3] fix: make sure git tag is accessible on container images

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7989708..cfe6783 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2-alpine3.19 AS build
+FROM docker.io/golang:1.22.2-alpine3.19 AS build
 
 RUN apk add make git curl
 
@@ -8,6 +8,7 @@ COPY go.mod go.sum ./
 RUN go mod download
 
 COPY . .
+COPY .git .
 RUN make build
 
 ###############################################################

From aa0f063ea3a85f14be2f3d02b4064658786dd3bc Mon Sep 17 00:00:00 2001
From: rramiachraf <51409801+rramiachraf@users.noreply.github.com>
Date: Sat, 5 Oct 2024 00:20:08 +0100
Subject: [PATCH 3/3] fix: make sure `./.git` is included while building image

---
 .github/workflows/image.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index de59f2a..73072a8 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -57,6 +57,8 @@ jobs:
           cache-to: type=gha,mode=max
           platforms: ${{ matrix.platform }}
           tags: ${{ steps.image-metadata.outputs.tags }}
+          build-args: |
+            BUILDKIT_CONTEXT_KEEP_GIT_DIR=true
 
   merge:
     runs-on: ubuntu-20.04