From a9ad8ed824f43e2e736ddb9e4a84497197ea13ab Mon Sep 17 00:00:00 2001
From: Scan <103391616+scanash00@users.noreply.github.com>
Date: Tue, 16 Sep 2025 21:08:11 -0400
Subject: [PATCH] fix: Bluesky PDS template finally works normally

---
 templates/compose/bluesky-pds.yaml | 54 +++++++++++++-----------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/templates/compose/bluesky-pds.yaml b/templates/compose/bluesky-pds.yaml
index f03e20dcc..65176e5f7 100644
--- a/templates/compose/bluesky-pds.yaml
+++ b/templates/compose/bluesky-pds.yaml
@@ -1,44 +1,35 @@
-# documentation: https://github.com/bluesky-social/pds
-# slogan: Bluesky PDS (Personal Data Server)
-# category: backend
-# tags: bluesky, pds, platform
-# logo: svgs/bluesky.svg
-# port: 3000
-
 services:
   pds:
     image: 'ghcr.io/bluesky-social/pds:latest'
     volumes:
-      - /root/pds-data:/pds
+      - './pds-data:/pds'
     environment:
       - SERVICE_FQDN_PDS_3000
-      - PDS_HOSTNAME=${SERVICE_URL_PDS}
-      - PDS_JWT_SECRET=${SERVICE_PASSWORD_JWT_SECRET}
-      - PDS_ADMIN_PASSWORD=${SERVICE_PASSWORD_ADMIN}
-      - PDS_ADMIN_EMAIL=${SERVICE_EMAIL_ADMIN}
-      - PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX=${PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX}
-      - PDS_DATA_DIRECTORY=${PDS_DATA_DIRECTORY:-/pds}
-      - PDS_BLOBSTORE_DISK_LOCATION=${PDS_DATA_DIRECTORY:-/pds}/blocks
-      - PDS_BLOB_UPLOAD_LIMIT=${PDS_BLOB_UPLOAD_LIMIT:-52428800}
-      - PDS_DID_PLC_URL=${PDS_DID_PLC_URL:-https://plc.directory}
-      - PDS_BSKY_APP_VIEW_URL=${PDS_BSKY_APP_VIEW_URL:-https://api.bsky.app}
-      - PDS_BSKY_APP_VIEW_DID=${PDS_BSKY_APP_VIEW_DID:-did:web:api.bsky.app}
-      - PDS_REPORT_SERVICE_URL=${PDS_REPORT_SERVICE_URL:-https://mod.bsky.app/xrpc/com.atproto.moderation.createReport}
-      - PDS_REPORT_SERVICE_DID=${PDS_REPORT_SERVICE_DID:-did:plc:ar7c4by46qjdydhdevvrndac}
-      - PDS_CRAWLERS=${PDS_CRAWLERS:-https://bsky.network}
-      - LOG_ENABLED=${LOG_ENABLED:-true}
-  
-    command: >
+      - 'PDS_HOSTNAME=${SERVICE_FQDN_PDS_3000}'
+      - 'PDS_JWT_SECRET=${SERVICE_PASSWORD_JWT_SECRET}'
+      - 'PDS_ADMIN_PASSWORD=${SERVICE_PASSWORD_ADMIN}'
+      - 'PDS_ADMIN_EMAIL=${SERVICE_EMAIL_ADMIN}'
+      - 'PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX=${PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX}'
+      - 'PDS_DATA_DIRECTORY=${PDS_DATA_DIRECTORY:-/pds}'
+      - 'PDS_BLOBSTORE_DISK_LOCATION=${PDS_DATA_DIRECTORY:-/pds}/blocks'
+      - 'PDS_BLOB_UPLOAD_LIMIT=${PDS_BLOB_UPLOAD_LIMIT:-52428800}'
+      - 'PDS_DID_PLC_URL=${PDS_DID_PLC_URL:-https://plc.directory}'
+      - 'PDS_BSKY_APP_VIEW_URL=${PDS_BSKY_APP_VIEW_URL:-https://api.bsky.app}'
+      - 'PDS_BSKY_APP_VIEW_DID=${PDS_BSKY_APP_VIEW_DID:-did:web:api.bsky.app}'
+      - 'PDS_REPORT_SERVICE_URL=${PDS_REPORT_SERVICE_URL:-https://mod.bsky.app/xrpc/com.atproto.moderation.createReport}'
+      - 'PDS_REPORT_SERVICE_DID=${PDS_REPORT_SERVICE_DID:-did:plc:ar7c4by46qjdydhdevvrndac}'
+      - 'PDS_CRAWLERS=${PDS_CRAWLERS:-https://bsky.network}'
+      - 'LOG_ENABLED=${LOG_ENABLED:-true}'
+    command: |
       sh -c '
-        echo "Installing required packages and pdsadmin..."
-        apk add --no-cache curl bash jq coreutils && \
+        set -euo pipefail; echo "Installing required packages and pdsadmin..."
+        apk add --no-cache curl bash jq coreutils >/dev/null && \
         curl -o /usr/local/bin/pdsadmin.sh https://raw.githubusercontent.com/bluesky-social/pds/main/pdsadmin.sh && \
         chmod +x /usr/local/bin/pdsadmin.sh && \
         ln -sf /usr/local/bin/pdsadmin.sh /usr/local/bin/pdsadmin
 
         echo "Generating /pds/pds.env..."
         printf "%s\n" \
-        "SERVICE_FQDN_PDS_3000=$${SERVICE_FQDN_PDS_3000}" \
         "PDS_HOSTNAME=$${PDS_HOSTNAME}" \
         "PDS_JWT_SECRET=$${PDS_JWT_SECRET}" \
         "PDS_ADMIN_PASSWORD=$${PDS_ADMIN_PASSWORD}" \
@@ -59,9 +50,12 @@ services:
         echo "Launching PDS..."
         exec node --enable-source-maps index.js
       '
-
     healthcheck:
-      test: ["CMD", "wget", "--spider", "http://127.0.0.1:3000/xrpc/_health"]
+      test:
+        - CMD
+        - wget
+        - '--spider'
+        - 'http://127.0.0.1:3000/xrpc/_health'
       interval: 2s
       timeout: 10s
       retries: 10