Merge branch 'develop' of code.apps.glenux.net:glenux-opencontainers/service-gotosocial into develop

.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: