From 02c936e880334c4282f4027e53f8f505fad78c95 Mon Sep 17 00:00:00 2001 From: Oleg Proskurin Date: Tue, 30 Sep 2025 23:03:41 +0700 Subject: [PATCH] fix: config issues --- docker-compose.yml | 71 +++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 77f9f03..540c530 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,11 +34,11 @@ services: networks: - banatie-network environment: - POSTGRES_DB: banatie + POSTGRES_DB: banatie_db POSTGRES_USER: banatie_user POSTGRES_PASSWORD: banatie_secure_password healthcheck: - test: ["CMD-SHELL", "pg_isready -U banatie_user -d banatie"] + test: ["CMD-SHELL", "pg_isready -U banatie_user -d banatie_db"] interval: 30s timeout: 10s retries: 3 @@ -84,45 +84,46 @@ services: depends_on: minio: condition: service_healthy - entrypoint: > - /bin/sh -c " - echo 'Setting up MinIO alias...'; - mc alias set storage http://minio:9000 ${MINIO_ROOT_USER} ${MINIO_ROOT_PASSWORD}; + entrypoint: + - /bin/sh + - -c + - | + echo 'Setting up MinIO alias...' + mc alias set storage http://minio:9000 $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD} - echo 'Creating main bucket...'; - mc mb --ignore-existing storage/banatie; + echo 'Creating main bucket...' + mc mb --ignore-existing storage/banatie - echo 'Creating service user...'; - mc admin user add storage banatie_service banatie_service_key_2024; + echo 'Creating service user...' + mc admin user add storage banatie_service banatie_service_key_2024 - echo 'Attaching readwrite policy to service user...'; - mc admin policy attach storage readwrite --user=banatie_service; + echo 'Attaching readwrite policy to service user...' + mc admin policy attach storage readwrite --user=banatie_service - echo 'Setting up lifecycle policy...'; - cat > /tmp/lifecycle.json << EOF - { - \"Rules\": [ - { - \"ID\": \"temp-cleanup\", - \"Status\": \"Enabled\", - \"Filter\": { - \"Prefix\": \"temp/\" - }, - \"Expiration\": { - \"Days\": 7 + echo 'Setting up lifecycle policy...' + cat > /tmp/lifecycle.json <<'LIFECYCLE' + { + "Rules": [ + { + "ID": "temp-cleanup", + "Status": "Enabled", + "Filter": { + "Prefix": "temp/" + }, + "Expiration": { + "Days": 7 + } } - } - ] - } - EOF - mc ilm import storage/banatie < /tmp/lifecycle.json; + ] + } + LIFECYCLE + mc ilm import storage/banatie < /tmp/lifecycle.json - echo 'Storage initialization completed!'; - echo 'Bucket: banatie'; - echo 'Using presigned URLs for secure access'; - echo 'SNMD mode: Full S3 compatibility enabled'; - exit 0; - " + echo 'Storage initialization completed!' + echo 'Bucket: banatie' + echo 'Using presigned URLs for secure access' + echo 'SNMD mode: Full S3 compatibility enabled' + exit 0 restart: "no" networks: