Skip to content

test(s3): simplify s3 configurations #919

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.

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 10 additions & 14 deletions compose/s3-cloudserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@ services:
s3:
condition: service_healthy
environment:
STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:8000
STORAGE_EXT_URL: /storage/
QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
QUARKUS_S3_AWS_REGION: us-east-1
QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: accessKey1
QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: verySecretKey1
AWS_ACCESS_KEY_ID: accessKey1
AWS_SECRET_ACCESS_KEY: verySecretKey1
s3:
Expand All @@ -27,13 +23,13 @@ services:
SCALITY_ACCESS_KEY_ID: accessKey1
SCALITY_SECRET_ACCESS_KEY: verySecretKey1
restart: always
# healthcheck:
# test:
# - CMD-SHELL
# - curl
# - --fail
# - http://localhost:8000/
# interval: 10s
# retries: 3
# start_period: 30s
# timeout: 5s
healthcheck:
test:
- CMD-SHELL
- curl
- --fail
- http://localhost:8000/_/healthcheck/deep
interval: 10s
retries: 3
start_period: 30s
timeout: 5s
4 changes: 0 additions & 4 deletions compose/s3-localstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@ services:
s3:
condition: service_healthy
environment:
STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:4566
STORAGE_EXT_URL: /storage/
QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
QUARKUS_S3_AWS_REGION: us-east-1
QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: unused
QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: unused
AWS_ACCESS_KEY_ID: unused
AWS_SECRET_ACCESS_KEY: unused
s3:
Expand Down
7 changes: 2 additions & 5 deletions compose/s3-minio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,23 @@ services:
s3:
condition: service_healthy
environment:
STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:9000
STORAGE_EXT_URL: /storage/
QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
QUARKUS_S3_AWS_REGION: us-east-1
QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: minioroot
QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: minioroot
AWS_ACCESS_KEY_ID: minioroot
AWS_SECRET_ACCESS_KEY: minioroot
s3:
image: ${MINIO_IMAGE:-quay.io/minio/minio:latest}
hostname: s3
ports:
- "9001:9001"
expose:
- "9000"
command: server /data --console-address ":9001"
environment:
MINIO_ROOT_USER: minioroot
MINIO_ROOT_PASSWORD: minioroot
MINIO_DEFAULT_BUCKETS: ${PRECREATE_BUCKETS}
volumes:
- minio_data:/data
- minio_certs:/certs
Expand Down
5 changes: 0 additions & 5 deletions compose/s3-seaweed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,10 @@ services:
s3:
condition: service_healthy
environment:
STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
CRYOSTAT_SERVICES_REPORTS_STORAGE_CACHE_NAME: archivedreports
QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:8333
STORAGE_EXT_URL: /storage/
QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
QUARKUS_S3_AWS_REGION: us-east-1
QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: access_key
QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: secret_key
AWS_ACCESS_KEY_ID: access_key
AWS_SECRET_ACCESS_KEY: secret_key
s3:
Expand Down
Loading