.drone.yml

@@ -23,14 +23,46 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-gotosocial:${DRONE_BRANCH/\\//-}_latest"
+      cache_from: "glenux/service-gotosocial:latest_${DRONE_BRANCH/\\//-}"
       repo: glenux/service-gotosocial
-      tags:
-        - "${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
-        - "${DRONE_BRANCH/\\//-}_latest"
-        - "latest"
+      tags: "${DRONE_COMMIT_SHA:0:8}"
       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:

Dockerfile

@@ -2,5 +2,4 @@
 # 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.16.0
+FROM superseriousbusiness/gotosocial:0.15.0