.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:
+      tags: "${DRONE_COMMIT_SHA:0:8}"
-        - "${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:
@@ -44,25 +76,23 @@ steps:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
     commands:
-      - export SSH_TARGET="$SSH_USER@$SSH_HOST"
+      - echo $SSH_USER
-      - set -x
+      - echo $SSH_HOST
-      - echo "$SSH_TARGET"
-      - echo $SSH_USER | wc -c
-      - echo $SSH_HOST | wc -c
       - echo $SSH_PRIVATE_KEY
       - apk update && apk add openssh-client
       - mkdir -p ~/.ssh && chmod 700 ~/.ssh
       - echo "$SSH_PRIVATE_KEY" | base64 -d > ~/.ssh/deploy_key
       - chmod 600 ~/.ssh/deploy_key
-      - ssh-keygen -f ~/.ssh/deploy_key -y > ~/.ssh/deploy_key.pub
-      - "cat ~/.ssh/deploy_key.pub | cut -f3 -d' '"
-      - ssh -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key $SSH_TARGET ps:stop social
       - ssh -o StrictHostKeyChecking=no
             -i ~/.ssh/deploy_key
-            $SSH_USER@$SSH_HOST
+            "$SSH_USER@$SSH_HOST"
+            ps:stop social
+      - ssh -o StrictHostKeyChecking=no
+            -i ~/.ssh/deploy_key
+            "$SSH_USER@$SSH_HOST"
             git:from-image social
-            "glenux/service-gotosocial:${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
+            "glenux/service-gotosocial:${DRONE_COMMIT_SHA:0:8}"
-      #
+            #
       - echo "SUCCESS"
 
 # volumes:

Dockerfile

@@ -1,10 +1,7 @@
-# FROM superseriousbusiness/gotosocial:0.11.0
+# FROM superseriousbusiness/gotosocial:latest
-# FROM superseriousbusiness/gotosocial:0.12.2
+# FROM superseriousbusiness/gotosocial:0.5.0-rc2
-# FROM superseriousbusiness/gotosocial:0.13.1
+# FROM superseriousbusiness/gotosocial:0.7.0
-# FROM superseriousbusiness/gotosocial:0.14.2
+FROM superseriousbusiness/gotosocial:0.7.1
-# FROM superseriousbusiness/gotosocial:0.15.0
+
-# FROM superseriousbusiness/gotosocial:0.16.0
+
-# FROM superseriousbusiness/gotosocial:0.17.0
+
-# FROM superseriousbusiness/gotosocial:0.17.4
-# FROM superseriousbusiness/gotosocial:0.18.0
-FROM superseriousbusiness/gotosocial:0.18.3

README.md

@@ -3,25 +3,3 @@
 
 # GotoSocial
 
-    dokku config:set social --no-restart GTS_ACCOUNTS_REGISTRATION_OPEN=false
-    dokku config:set social --no-restart GTS_ADVANCED_RATE_LIMIT_REQUESTS=0
-    dokku config:set social --no-restart GTS_ADVANCED_THROTTLING_MULTIPLIER=32
-    dokku config:set social --no-restart GTS_ADVANCED_THROTTLING_RETRY_AFTER=120s
-    dokku config:set social --no-restart GTS_CONTACT=glenux
-    dokku config:set social --no-restart GTS_DB_ADDRESS=exampledbhost
-    dokku config:set social --no-restart GTS_DB_DATABASE=exampledb
-    dokku config:set social --no-restart GTS_DB_PASSWORD=example
-    dokku config:set social --no-restart GTS_DB_PORT=5432
-    dokku config:set social --no-restart GTS_DB_TLS_CA_CERT=
-    dokku config:set social --no-restart GTS_DB_TLS_MODE=disable
-    dokku config:set social --no-restart GTS_DB_TYPE=postgres
-    dokku config:set social --no-restart GTS_DB_USER=postgres
-    dokku config:set social --no-restart GTS_EMAIL=admin@example.com
-    dokku config:set social --no-restart GTS_HOST=example.com
-    dokku config:set social --no-restart GTS_INSTANCE_EXPOSE_PUBLIC_TIMELINE=true
-    dokku config:set social --no-restart GTS_LETSENCRYPT_EMAIL_ADDRESS=admin@example.com
-    dokku config:set social --no-restart GTS_LETSENCRYPT_ENABLED=false
-    dokku config:set social --no-restart GTS_MEDIA_REMOTE_CACHE_DAYS=3
-    dokku config:set social --no-restart GTS_TRUSTED_PROXIES=127.0.0.1/32,172.17.0.1,::1
-    dokku config:set social --no-restart GTS_USERNAME=admin
-