From 0225c486ffb987ddc6373f09d985091c66766278 Mon Sep 17 00:00:00 2001
From: Scan <103391616+scanash00@users.noreply.github.com>
Date: Sat, 20 Sep 2025 01:10:00 -0400
Subject: [PATCH] fix: both email envs are needed in order for the PDS to
 start, so set the other one as required

---
 templates/compose/bluesky-pds.yaml | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/templates/compose/bluesky-pds.yaml b/templates/compose/bluesky-pds.yaml
index 74e3bb1e4..da3dcfb65 100644
--- a/templates/compose/bluesky-pds.yaml
+++ b/templates/compose/bluesky-pds.yaml
@@ -1,15 +1,8 @@
-# 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:
-      - './pds-data:/pds'
+      - 'pds-data:/pds'
     environment:
       - SERVICE_FQDN_PDS_3000
       - 'PDS_HOSTNAME=${SERVICE_FQDN_PDS_3000}'
@@ -21,7 +14,7 @@ services:
       - 'PDS_BLOBSTORE_DISK_LOCATION=${PDS_DATA_DIRECTORY:-/pds}/blocks'
       - 'PDS_BLOB_UPLOAD_LIMIT=${PDS_BLOB_UPLOAD_LIMIT:-104857600}'
       - 'PDS_DID_PLC_URL=${PDS_DID_PLC_URL:-https://plc.directory}'
-      - 'PDS_EMAIL_FROM_ADDRESS=${PDS_EMAIL_FROM_ADDRESS}'
+      - 'PDS_EMAIL_FROM_ADDRESS=${PDS_EMAIL_FROM_ADDRESS:?}'
       - 'PDS_EMAIL_SMTP_URL=${PDS_EMAIL_SMTP_URL:-smtps://username:password@smtp.example.com/}'
       - '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}'
@@ -29,20 +22,19 @@ services:
       - 'PDS_REPORT_SERVICE_DID=${PDS_REPORT_SERVICE_DID:-did:plc:ar7c4by46qjdydhdevvrndac}'
       - 'PDS_CRAWLERS=${PDS_CRAWLERS:-https://bsky.network}'
       - 'LOG_ENABLED=${LOG_ENABLED:-true}'
-    
-    command: >
+    command: |
       sh -c '
-        set -euo pipefail; echo "Installing required packages and pdsadmin..."
-        apk add --no-cache openssl curl bash jq coreutils gnupg util-linux-misc >/dev/null && \
-        curl -o /usr/local/bin/pdsadmin.sh https://raw.githubusercontent.com/bluesky-social/pds/main/pdsadmin.sh && \
-        chmod 700 /usr/local/bin/pdsadmin.sh && \
+        set -euo pipefail
+        echo "Installing required packages and pdsadmin..."
+        apk add --no-cache openssl curl bash jq coreutils gnupg util-linux-misc >/dev/null
+        curl -o /usr/local/bin/pdsadmin.sh https://raw.githubusercontent.com/bluesky-social/pds/main/pdsadmin.sh
+        chmod 700 /usr/local/bin/pdsadmin.sh
         ln -sf /usr/local/bin/pdsadmin.sh /usr/local/bin/pdsadmin
         echo "Creating an empty pds.env file so pdsadmin works..."
         touch ${PDS_DATA_DIRECTORY}/pds.env
         echo "Launching PDS, enjoy!..."
         exec node --enable-source-maps index.js
       '
-
     healthcheck:
       test:
         - CMD
@@ -52,3 +44,5 @@ services:
       interval: 2s
       timeout: 10s
       retries: 10
+volumes:
+  pds-data: