From 545720fe9b0a66feef6665b3ac9f9ff3491f61a6 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 28 Oct 2026 15:25:03 -0300
Subject: [PATCH] feat: s3

---
 .env.sample        |  9 +++++++++
 abra.sh            |  2 +-
 compose.s3.yml     | 17 +++++++++++++++++
 entrypoint.sh.tmpl |  1 +
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 compose.s3.yml

diff --git a/.env.sample b/.env.sample
index 1639385..64248c9 100644
--- a/.env.sample
+++ b/.env.sample
@@ -57,3 +57,12 @@ COMPOSE_FILE="compose.yml"
 # Only present in config.json (no equivalent env var):
 # DOCUMENT_MAX_LENGTH=100000
 # CMD_ENABLE_UPLOADS=registered
+
+# S3 uploads
+#COMPOSE_FILE="$COMPOSE_FILE:compose.s3.yml"
+#CMD_S3_ACCESS_KEY_ID=
+#CMD_S3_REGION=garage
+#CMD_S3_BUCKET=$DOMAIN
+#CMD_S3_ENDPOINT=
+#CMD_S3_FOLDER=uploads
+#SECRET_S3_SECRET_ACCESS_KEY_VERSION=v1
diff --git a/abra.sh b/abra.sh
index 918a1e9..d1d1b7d 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,3 +1,3 @@
-export ENTRYPOINT_CONF_VERSION=v13
+export ENTRYPOINT_CONF_VERSION=v14
 export CONFIG_JSON_VERSION=v1
 export PG_BACKUP_VERSION=v1
diff --git a/compose.s3.yml b/compose.s3.yml
new file mode 100644
index 0000000..26002bd
--- /dev/null
+++ b/compose.s3.yml
@@ -0,0 +1,17 @@
+---
+version: "3.8"
+services:
+  app:
+    environment:
+      - CMD_S3_ACCESS_KEY_ID
+      - CMD_S3_REGION
+      - CMD_S3_BUCKET
+      - CMD_S3_ENDPOINT
+      - CMD_S3_FOLDER
+      - CMD_S3_PUBLIC_FILES=false
+    secrets:
+      - s3_secret_access_key
+secrets:
+  s3_secret_access_key:
+    external: true
+    name: ${STACK_NAME}_s3_secret_access_key_${SECRET_S3_SECRET_ACCESS_KEY_VERSION}
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index 3269fa2..9f5e638 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -27,6 +27,7 @@ load_vars() {
   fi
   file_env "CMD_OAUTH2_CLIENT_SECRET"
   file_env "CMD_SESSION_SECRET"
+  file_env "CMD_S3_SECRET_ACCESS_KEY"
 }
 
 main() {
-- 
2.54.0