From 6228bdf5f4380d4cfa6b8144897ac3a84835c5f3 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sat, 19 Oct 2024 15:03:34 +0200
Subject: [PATCH 1/2] ci: fix tagging strategy

---
 .drone.yml | 42 +++++-------------------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 29b3659..78069cc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,46 +23,14 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-gotosocial:latest_${DRONE_BRANCH/\\//-}"
+      cache_from: "glenux/service-gotosocial:${DRONE_BRANCH/\\//-}_latest"
       repo: glenux/service-gotosocial
-      tags: "${DRONE_COMMIT_SHA:0:8}"
+      tags:
+        - "${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
+        - "${DRONE_BRANCH/\\//-}_latest"
+        - "latest"
       purge: false
 
-  - name: publish:commit_branch
-    image: plugins/docker
-    # volumes:
-    #   - name: cache
-    #     path: /stupid
-    settings:
-      username:
-        from_secret: DOCKERHUB_USERNAME
-      password:
-        from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-gotosocial:latest_${DRONE_BRANCH/\\//-}"
-      repo: glenux/service-gotosocial
-      tags: "latest_${DRONE_BRANCH/\\//-}"
-      purge: false
-    when:
-      branch:
-        - "master"
-        - "develop"
-        - "feature/*"
-
-  - name: publish:latest
-    image: plugins/docker
-    settings:
-      username:
-        from_secret: DOCKERHUB_USERNAME
-      password:
-        from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-gotosocial:latest_${DRONE_BRANCH/\\//-}"
-      repo: glenux/service-gotosocial
-      tags: latest
-      purge: false
-    when:
-      branch:
-        - master
-
   - name: deploy:dokku
     image: alpine
     when:

From e307871a20432aaf7cd56ea172bd99392b63c3b0 Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Sat, 19 Oct 2024 12:47:09 +0000
Subject: [PATCH 2/2] Update Dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index 70cb5ef..05914df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,4 +2,5 @@
 # FROM superseriousbusiness/gotosocial:0.12.2
 # FROM superseriousbusiness/gotosocial:0.13.1
 # FROM superseriousbusiness/gotosocial:0.14.2
-FROM superseriousbusiness/gotosocial:0.15.0
+# FROM superseriousbusiness/gotosocial:0.15.0
+FROM superseriousbusiness/gotosocial:0.16.0