Attempt at universal abra wrapper

entrypoint.sh

@@ -1,20 +1,26 @@
 #!/bin/sh
+set -e
 
-DJANGO_SECRET_KEY="$(cat /run/secrets/django_secret_key)"
-OIDC_RP_CLIENT_SECRET="$(cat /run/secrets/oidc_rp_client_secret)"
-DJANGO_SUPERUSER_PASSWORD="$(cat /run/secrets/django_superuser_password)"
-COLLABORATION_SERVER_SECRET="$(cat /run/secrets/collaboration_server_secret)"
-POSTGRES_PASSWORD="$(cat /run/secrets/postgres_password)"
-DB_PASSWORD="$(cat /run/secrets/db_password)"
-MINIO_ROOT_PASSWORD="$(cat /run/secrets/minio_root_password)"
+echo "++ running new entrypoint"
+ORIGINAL_ENTRYPOINT="$1"
+shift
 
-export DJANGO_SECRET_KEY
-export OIDC_RP_CLIENT_SECRET
-export DJANGO_SUPERUSER_PASSWORD
-export COLLABORATION_SERVER_SECRET
-export POSTGRES_PASSWORD
-export DB_PASSWORD
-export MINIO_ROOT_PASSWORD
+echo "++ original entrypoint: ${ORIGINAL_ENTRYPOINT}"
 
-# Execute the actual command (from command: in compose.yml)
-exec "$@"
+# --- Load secrets into environment variables ---
+if [ -d /run/secrets ]; then
+  for secret_file in /run/secrets/*; do
+    echo "++ loading secret: ${secret_file}"
+    var_name=$(basename "$secret_file" | tr '[:lower:]' '[:upper:]')
+    export "$var_name"="$(cat "$secret_file")"
+  done
+fi
+
+echo "++ command: ${@}"
+
+# --- Execute the original entrypoint and command ---
+if [ -n "$ORIGINAL_ENTRYPOINT" ] && [ "$ORIGINAL_ENTRYPOINT" != "null" ]; then
+  exec "$ORIGINAL_ENTRYPOINT" "$@"
+else
+  exec "$@"
+fi