generated from coop-cloud/example
add support for local storage
This commit is contained in:
parent
8c3521b87f
commit
73de12d12f
|
@ -21,7 +21,6 @@ steps:
|
||||||
SECRET_DB_PASSWORD_VERSION: v1
|
SECRET_DB_PASSWORD_VERSION: v1
|
||||||
SECRET_SECRET_KEY_VERSION: v1 # length=64
|
SECRET_SECRET_KEY_VERSION: v1 # length=64
|
||||||
SECRET_UTILS_SECRET_VERSION: v1 # length=64
|
SECRET_UTILS_SECRET_VERSION: v1 # length=64
|
||||||
SECRET_AWS_SECRET_KEY_VERSION: v1
|
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
- main
|
- main
|
||||||
|
|
23
.env.sample
23
.env.sample
|
@ -15,15 +15,9 @@ COMPOSE_FILE="compose.yml"
|
||||||
SECRET_DB_PASSWORD_VERSION=v1
|
SECRET_DB_PASSWORD_VERSION=v1
|
||||||
SECRET_SECRET_KEY_VERSION=v1 # length=64
|
SECRET_SECRET_KEY_VERSION=v1 # length=64
|
||||||
SECRET_UTILS_SECRET_VERSION=v1 # length=64
|
SECRET_UTILS_SECRET_VERSION=v1 # length=64
|
||||||
SECRET_AWS_SECRET_KEY_VERSION=v1
|
|
||||||
|
|
||||||
AWS_ACCESS_KEY_ID=
|
# Set to s3 to use AWS S3 bucket
|
||||||
AWS_REGION=
|
FILE_STORAGE=local
|
||||||
AWS_S3_UPLOAD_BUCKET_URL=
|
|
||||||
AWS_S3_UPLOAD_BUCKET_NAME=
|
|
||||||
AWS_S3_UPLOAD_MAX_SIZE=26214400
|
|
||||||
AWS_S3_FORCE_PATH_STYLE=true
|
|
||||||
AWS_S3_ACL=private
|
|
||||||
|
|
||||||
# –––––––––––––––– OPTIONAL ––––––––––––––––
|
# –––––––––––––––– OPTIONAL ––––––––––––––––
|
||||||
|
|
||||||
|
@ -85,3 +79,16 @@ ALLOWED_DOMAINS=
|
||||||
#GOOGLE_ENABLED=1
|
#GOOGLE_ENABLED=1
|
||||||
#GOOGLE_CLIENT_ID=
|
#GOOGLE_CLIENT_ID=
|
||||||
#SECRET_GOOGLE_CLIENT_SECRET_VERSION=v1
|
#SECRET_GOOGLE_CLIENT_SECRET_VERSION=v1
|
||||||
|
|
||||||
|
COMPOSE_FILE="$COMPOSE_FILE:compose.local.yml"
|
||||||
|
FILE_STORAGE_UPLOAD_MAX_SIZE=26214400
|
||||||
|
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.aws.yml"
|
||||||
|
#AWS_ACCESS_KEY_ID=
|
||||||
|
#AWS_REGION=
|
||||||
|
#AWS_S3_UPLOAD_BUCKET_URL=
|
||||||
|
#AWS_S3_UPLOAD_BUCKET_NAME=
|
||||||
|
#AWS_S3_UPLOAD_MAX_SIZE=26214400
|
||||||
|
#AWS_S3_FORCE_PATH_STYLE=true
|
||||||
|
#AWS_S3_ACL=private
|
||||||
|
#SECRET_AWS_SECRET_KEY_VERSION=v1
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
---
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
secrets:
|
||||||
|
- aws_secret_key
|
||||||
|
environment:
|
||||||
|
- AWS_ACCESS_KEY_ID
|
||||||
|
- AWS_REGION
|
||||||
|
- AWS_S3_ACL
|
||||||
|
- AWS_S3_FORCE_PATH_STYLE
|
||||||
|
- AWS_S3_UPLOAD_BUCKET_NAME
|
||||||
|
- AWS_S3_UPLOAD_BUCKET_URL
|
||||||
|
- AWS_S3_UPLOAD_MAX_SIZE
|
||||||
|
- AWS_SDK_LOAD_CONFIG=0
|
||||||
|
- AWS_SECRET_KEY_FILE=/run/secrets/aws_secret_key
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
aws_secret_key:
|
||||||
|
name: ${STACK_NAME}_aws_secret_key_${SECRET_AWS_SECRET_KEY_VERSION}
|
||||||
|
external: true
|
|
@ -0,0 +1,13 @@
|
||||||
|
---
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
volumes:
|
||||||
|
- storage-data:/var/lib/outline/data
|
||||||
|
environment:
|
||||||
|
- FILE_STORAGE
|
||||||
|
- FILE_STORAGE_UPLOAD_MAX_SIZE
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
storage-data:
|
14
compose.yml
14
compose.yml
|
@ -8,7 +8,6 @@ services:
|
||||||
- proxy
|
- proxy
|
||||||
image: outlinewiki/outline:0.73.1
|
image: outlinewiki/outline:0.73.1
|
||||||
secrets:
|
secrets:
|
||||||
- aws_secret_key
|
|
||||||
- db_password
|
- db_password
|
||||||
- secret_key
|
- secret_key
|
||||||
- utils_secret
|
- utils_secret
|
||||||
|
@ -17,15 +16,7 @@ services:
|
||||||
target: /docker-entrypoint.sh
|
target: /docker-entrypoint.sh
|
||||||
mode: 0555
|
mode: 0555
|
||||||
environment:
|
environment:
|
||||||
- AWS_ACCESS_KEY_ID
|
- FILE_STORAGE
|
||||||
- AWS_REGION
|
|
||||||
- AWS_S3_ACL
|
|
||||||
- AWS_S3_FORCE_PATH_STYLE
|
|
||||||
- AWS_S3_UPLOAD_BUCKET_NAME
|
|
||||||
- AWS_S3_UPLOAD_BUCKET_URL
|
|
||||||
- AWS_S3_UPLOAD_MAX_SIZE
|
|
||||||
- AWS_SDK_LOAD_CONFIG=0
|
|
||||||
- AWS_SECRET_KEY_FILE=/run/secrets/aws_secret_key
|
|
||||||
- DATABASE_PASSWORD_FILE=/run/secrets/db_password
|
- DATABASE_PASSWORD_FILE=/run/secrets/db_password
|
||||||
- FORCE_HTTPS=true
|
- FORCE_HTTPS=true
|
||||||
- PGSSLMODE=disable
|
- PGSSLMODE=disable
|
||||||
|
@ -85,9 +76,6 @@ secrets:
|
||||||
utils_secret:
|
utils_secret:
|
||||||
name: ${STACK_NAME}_utils_secret_${SECRET_UTILS_SECRET_VERSION}
|
name: ${STACK_NAME}_utils_secret_${SECRET_UTILS_SECRET_VERSION}
|
||||||
external: true
|
external: true
|
||||||
aws_secret_key:
|
|
||||||
name: ${STACK_NAME}_aws_secret_key_${SECRET_AWS_SECRET_KEY_VERSION}
|
|
||||||
external: true
|
|
||||||
db_password:
|
db_password:
|
||||||
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||||
external: true
|
external: true
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
{{ if eq (env "FILE_STORAGE") "s3" }}
|
||||||
export AWS_SECRET_ACCESS_KEY=$(cat /run/secrets/aws_secret_key)
|
export AWS_SECRET_ACCESS_KEY=$(cat /run/secrets/aws_secret_key)
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
{{ if eq (env "SMTP_ENABLED") "1" }}
|
{{ if eq (env "SMTP_ENABLED") "1" }}
|
||||||
export SMTP_PASSWORD=$(cat /run/secrets/smtp_password)
|
export SMTP_PASSWORD=$(cat /run/secrets/smtp_password)
|
||||||
|
|
Loading…
Reference in New Issue