fix: aws env var naming & threading

.env.sample

@@ -16,7 +16,7 @@ SECRET_UTILS_SECRET_VERSION=v1  # length=64
 SECRET_AWS_SECRET_KEY=v1
 SECRET_OIDC_CLIENT_SECRET_VERSION=v1
 
-AWS_SECRET_ACCESS_KEY=
+AWS_ACCESS_KEY_ID=
 AWS_REGION=
 AWS_S3_UPLOAD_BUCKET_URL=
 AWS_S3_UPLOAD_BUCKET_NAME=

README.md

@@ -42,4 +42,4 @@ yarn db:migrate --env=production-ssl-disabled
 
 ### Setting up your `.env` config
 
-Don't use quotes (`"..."`), the NodeJS scripts flip out for some reason.
+Avoid the use of quotes (`"..."`) as much as possible, the NodeJS scripts flip out for some reason on some vars.

abra.sh

@@ -1 +1 @@
-export APP_ENTRYPOINT_VERSION=v1
+export APP_ENTRYPOINT_VERSION=v2

compose.yml

@@ -20,6 +20,7 @@ services:
     volumes:
       - outline_data:/opt/outline
     environment:
+      - AWS_ACCESS_KEY_ID
       - AWS_REGION
       - AWS_S3_ACL
       - AWS_S3_FORCE_PATH_STYLE
@@ -27,7 +28,6 @@ services:
       - AWS_S3_UPLOAD_BUCKET_URL
       - AWS_S3_UPLOAD_MAX_SIZE
       - AWS_SDK_LOAD_CONFIG=0
-      - AWS_SECRET_ACCESS_KEY
       - AWS_SECRET_KEY_FILE=/run/secrets/aws_secret_key
       - DATABASE_PASSWORD_FILE=/run/secrets/db_password
       - FORCE_HTTPS=true

entrypoint.sh.tmpl

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export AWS_SECRET_KEY=$(cat /run/secrets/aws_secret_key)
+export AWS_SECRET_ACCESS_KEY=$(cat /run/secrets/aws_secret_key)
 export OIDC_CLIENT_SECRET=$(cat /run/secrets/oidc_client_secret)
 export UTILS_SECRET=$(cat /run/secrets/utils_secret)
 export SECRET_KEY=$(cat /run/secrets/secret_key)