Skip to content

Commit

Permalink
build: fix env
Browse files Browse the repository at this point in the history
  • Loading branch information
xmlking committed Apr 14, 2024
1 parent f75255a commit 0461772
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ pids
!.env.example
!.env.local.example
!.env.production.example
!.env.prod.example
!.env.test.example
!.env.project
!.env.vault
Expand All @@ -93,6 +94,7 @@ pids
!.secrets.example
!.secrets.local.example
!.secrets.production.example
!.secrets.prod.example
!.secrets.test.example

# nhost #
Expand Down
6 changes: 3 additions & 3 deletions .secrets.example
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ AUTH_SMTP_PASS = 'password'
AUTH_SMTP_SENDER = 'hasura-auth@example.com'

## STORAGE
STORAGE_ACCESS_KEY = 'storage-access-key-never-use-this-value'
STORAGE_SECRET_KEY = 'storage-secret-key-never-use-this-value'
STORAGE_DEFAULT_BUCKETS = 'apps:download,public:public'
MINIO_DEFAULT_BUCKETS = 'apps:download,public:public'
S3_ACCESS_KEY = 'storage-access-key-never-use-this-value'
S3_SECRET_KEY = 'storage-secret-key-never-use-this-value'

## AI
OPENAI_API_KEY = 'FIXME'
Expand Down
17 changes: 17 additions & 0 deletions .secrets.prod.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

## SMTP (for local development, use `mailpit` server, for prod: set appropriate `AUTH_SMTP_` variables)
AUTH_SMTP_HOST = 'smtp-relay.sendinblue.com'
AUTH_SMTP_PORT = '587'
AUTH_SMTP_AUTH_METHOD = 'LOGIN'
AUTH_SMTP_SECURE = 'false'
AUTH_SMTP_USER = 'xxxx@gmail.com'
AUTH_SMTP_PASS = 'xxxx'
AUTH_SMTP_SENDER = 'xxxx@gmail.com'

## STORAGE
S3_ACCESS_KEY = 'xxxxx'
S3_SECRET_KEY = 'xxxxx'
S3_BUCKET = 'xxxxx'
S3_ENDPOINT = 'https://storage.googleapis.com'
S3_REGION = 'us-west1'
S3_ROOT_FOLDER = ''
18 changes: 9 additions & 9 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,9 @@ services:
volumes:
- minio:/bitnami/minio/data
environment:
MINIO_ROOT_USER: ${STORAGE_ACCESS_KEY}
MINIO_ROOT_PASSWORD: ${STORAGE_SECRET_KEY}
MINIO_DEFAULT_BUCKETS: ${STORAGE_DEFAULT_BUCKETS:-apps:download,public:public}
MINIO_ROOT_USER: ${S3_ACCESS_KEY}
MINIO_ROOT_PASSWORD: ${S3_SECRET_KEY}
MINIO_DEFAULT_BUCKETS: ${MINIO_DEFAULT_BUCKETS:-apps:download,public:public}
expose:
- 9000
- 9001
Expand Down Expand Up @@ -325,12 +325,12 @@ services:
POSTGRES_MIGRATIONS: "1"
POSTGRES_MIGRATIONS_SOURCE: postgres://postgres:${POSTGRES_PASSWORD:-postgres}@postgres:5432/postgres?sslmode=disable
PUBLIC_URL: https://storage${BASE_HOSTNAME}
S3_ACCESS_KEY: ${STORAGE_ACCESS_KEY}
S3_BUCKET: public
S3_ENDPOINT: http://minio:9000
S3_REGION: ""
S3_ROOT_FOLDER: ""
S3_SECRET_KEY: ${STORAGE_SECRET_KEY}
S3_ACCESS_KEY: ${S3_ACCESS_KEY}
S3_BUCKET: ${S3_BUCKET:-public}
S3_ENDPOINT: ${S3_ENDPOINT:-http://minio:9000}
S3_REGION: ${S3_REGION:-}
S3_ROOT_FOLDER: ${S3_ROOT_FOLDER:-}
S3_SECRET_KEY: ${S3_SECRET_KEY}
depends_on:
traefik:
condition: service_healthy
Expand Down

0 comments on commit 0461772

Please sign in to comment.