Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MINIO_ENDPOINT to env #5463

Merged
merged 3 commits into from
Jan 22, 2025
Merged

Add MINIO_ENDPOINT to env #5463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d123cd
Fix load test customer
myersCody Jan 22, 2025
054e31a
add MINIO_ENDPOINT
maskarb Jan 22, 2025
f9c7167
update env example
maskarb Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ AWS_RESOURCE_NAME=YOUR_COST_MANAGEMENT_AWS_ARN
SCHEMA_SUFFIX="" # if DEVELOPMENT=True, this can be left empty and will default to $USER; otherwise, set this value to something unique

AWS_CATALOG_ID=589173575009
S3_ENDPOINT=https://s3.us-east-1.amazonaws.com
MINIO_ENDPOINT=http://koku-minio:9000
S3_ENDPOINT=http://localhost:9000
S3_ACCESS_KEY=kokuminioaccess
S3_SECRET=kokuminiosecret

S3_BUCKET_NAME=hccm-local-s3
S3_ACCESS_KEY=CHANGEME
S3_SECRET=CHANGEME
S3_BUCKET_NAME=koku-bucket
S3_REGION=us-east-1

# GCP
Expand Down
14 changes: 7 additions & 7 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ services:
- DATABASE_PASSWORD=${DATABASE_PASSWORD-postgres}
- S3_BUCKET_NAME_OCP_INGRESS=${S3_BUCKET_NAME_OCP_INGRESS-ocp-ingress}
- S3_BUCKET_NAME=${S3_BUCKET_NAME-koku-bucket}
- S3_ENDPOINT
- S3_ENDPOINT=${MINIO_ENDPOINT-http://koku-minio:9000}
- S3_ACCESS_KEY
- S3_SECRET
- DJANGO_READ_DOT_ENV_FILE=True
Expand Down Expand Up @@ -188,7 +188,7 @@ services:
- ENABLE_SUBS_PROVIDER_TYPES=${ENABLE_SUBS_PROVIDER_TYPES}
- ENABLE_ROS_DEBUG=${ENABLE_ROS_DEBUG-False}
- S3_BUCKET_NAME=${S3_BUCKET_NAME-koku-bucket}
- S3_ENDPOINT
- S3_ENDPOINT=${MINIO_ENDPOINT-http://koku-minio:9000}
- S3_ACCESS_KEY
- S3_SECRET
- DATA_DIR=${DATA_DIR-/testing/data}
Expand Down Expand Up @@ -282,7 +282,7 @@ services:
- INITIAL_INGEST_NUM_MONTHS=1
- PYTHONPATH=/koku/koku
- S3_BUCKET_NAME=${S3_BUCKET_NAME-koku-bucket}
- S3_ENDPOINT
- S3_ENDPOINT=${MINIO_ENDPOINT-http://koku-minio:9000}
- S3_ACCESS_KEY
- S3_SECRET
- TRINO_HOST=${TRINO_HOST-trino}
Expand Down Expand Up @@ -322,7 +322,7 @@ services:
- ENABLE_SUBS_DEBUG=${ENABLE_SUBS_DEBUG-False}
- ENABLE_SUBS_PROVIDER_TYPES=${ENABLE_SUBS_PROVIDER_TYPES}
- S3_BUCKET_NAME=${S3_BUCKET_NAME-koku-bucket}
- S3_ENDPOINT
- S3_ENDPOINT=${MINIO_ENDPOINT-http://koku-minio:9000}
- S3_ACCESS_KEY
- S3_SECRET
- AWS_SHARED_CREDENTIALS_FILE=${AWS_SHARED_CREDENTIALS_FILE-}
Expand Down Expand Up @@ -619,7 +619,7 @@ services:
entrypoint: >
/bin/sh -c "
/usr/bin/mc config host rm local;
/usr/bin/mc config host add --quiet --api s3v4 local $S3_ENDPOINT $S3_ACCESS_KEY $S3_SECRET;
/usr/bin/mc config host add --quiet --api s3v4 local $MINIO_ENDPOINT $S3_ACCESS_KEY $S3_SECRET;
/usr/bin/mc rb --force local/koku-bucket/;
/usr/bin/mc mb --quiet local/koku-bucket/;
/usr/bin/mc anonymous set public local/koku-bucket;
Expand All @@ -638,7 +638,7 @@ services:
- 9083:8000
environment:
- HIVE_LOGLEVEL=INFO
- S3_ENDPOINT=${S3_ENDPOINT-http://koku-minio:9000}
- S3_ENDPOINT=${MINIO_ENDPOINT-http://koku-minio:9000}
- S3_ACCESS_KEY=${S3_ACCESS_KEY-kokuminioaccess}
- S3_SECRET=${S3_SECRET-kokuminiosecret}
- S3_BUCKET_NAME=${S3_BUCKET_NAME-koku-bucket}
Expand Down Expand Up @@ -666,7 +666,7 @@ services:
- MY_NODE_ID=${MY_NODE_ID-localhost}
- LOCAL=TRUE
- TRINO_LOG_LEVEL=${LOG_LEVEL-INFO}
- S3_ENDPOINT=${S3_ENDPOINT-http://koku-minio:9000}
- S3_ENDPOINT=${MINIO_ENDPOINT-http://koku-minio:9000}
- S3_BUCKET_NAME=${S3_BUCKET_NAME-koku-bucket}
- S3_ACCESS_KEY=${S3_ACCESS_KEY-kokuminioaccess}
- S3_SECRET=${S3_SECRET-kokuminiosecret}
Expand Down