From 6251961a79f9ff92b0121c8c504db46328152c92 Mon Sep 17 00:00:00 2001 From: glenux Date: Sat, 19 Oct 2024 12:47:09 +0000 Subject: [PATCH 1/5] 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 -- 2.45.2 From 297ef04903c155f006803fcde1043aef0eb6ea67 Mon Sep 17 00:00:00 2001 From: Glenn Date: Sat, 19 Oct 2024 15:03:34 +0200 Subject: [PATCH 2/5] 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: -- 2.45.2 From 7b252352eabe18cc04905755a5a745dcf8211d52 Mon Sep 17 00:00:00 2001 From: Glenn Date: Sat, 19 Oct 2024 15:32:40 +0200 Subject: [PATCH 3/5] ci: fix image name in deploy --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 78069cc..794db1a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -59,7 +59,7 @@ steps: -i ~/.ssh/deploy_key "$SSH_USER@$SSH_HOST" git:from-image social - "glenux/service-gotosocial:${DRONE_COMMIT_SHA:0:8}" + "glenux/service-gotosocial:${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}" # - echo "SUCCESS" -- 2.45.2 From c2b7e726b166c79d515131cf22cc77155b7e6339 Mon Sep 17 00:00:00 2001 From: Glenn Date: Sat, 19 Oct 2024 16:07:47 +0200 Subject: [PATCH 4/5] docs: update README with example --- README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.md b/README.md index 3d517cd..de1859e 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,25 @@ # 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 + -- 2.45.2 From 0fa82d87fe610a732e0b5489fb88058495800982 Mon Sep 17 00:00:00 2001 From: Glenn Date: Sat, 19 Oct 2024 16:08:01 +0200 Subject: [PATCH 5/5] Bump to 0.17.0 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 05914df..b16ac08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,4 +3,5 @@ # 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.16.0 +FROM superseriousbusiness/gotosocial:0.17.0 -- 2.45.2