diff --git a/.env b/.env index eb18f05a564052de19c8bd60c1b4b7bc90c38cd0..fa7f07bfb02abe75be43d60ef5350d169f242904 100644 --- a/.env +++ b/.env @@ -7,6 +7,7 @@ FUSIONAUTH_APP_MEMORY=512M MINIO_USERNAME=workflow-dev MINIO_PASSWORD=workflow-dev +MINIO_BUCKETNAME=affiliationbucket # central envs CENTRAL_USER_EMAIL=chakshu@samagragovernance.in diff --git a/.gitpod.yml b/.gitpod.yml index 3f4ea49fa1319d4e9cdf020fee71a4b26c9ad605..3f7a37ebdc116e035ce9fff72e6e19a38828ba07 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -29,7 +29,12 @@ tasks: openMode: tab-after init: | gp sync-await setup + source .env + docker run --name enketo-redis-main -p 6369:6379 -d redis cd packages/form-manager + echo "MINIO_USERNAME=$MINIO_USERNAME" >> .env + echo "MINIO_PASSWORD=$MINIO_PASSWORD" >> .env + echo "MINIO_BUCKETNAME=$MINIO_BUCKETNAME" >> .env nvm use 16 pnpm install command: | diff --git a/docker-compose.gitpod.yaml b/docker-compose.gitpod.yaml index 31f17e489f5bb228e9f37c0f0334611218aff411..840ac81e6bd7de41869a4459bd7a17c89b0399c6 100644 --- a/docker-compose.gitpod.yaml +++ b/docker-compose.gitpod.yaml @@ -136,12 +136,25 @@ services: - "9000:9000" - "9001:9001" volumes: - - ./mnt/cqube_bucket/minio:/data + - minio-data:/data environment: MINIO_ROOT_USER: ${MINIO_USERNAME} MINIO_ROOT_PASSWORD: ${MINIO_PASSWORD} command: server --console-address ":9001" /data + createbuckets: + image: minio/mc + depends_on: + - minio + entrypoint: > + /bin/sh -c " + /usr/bin/mc config host add myminio http://minio:9000 ${MINIO_USERNAME} ${MINIO_PASSWORD}; + /usr/bin/mc rm -r --force myminio/${MINIO_BUCKETNAME}; + /usr/bin/mc mb myminio/${MINIO_BUCKETNAME}; + /usr/bin/mc policy download myminio/${MINIO_BUCKETNAME}; + exit 0; + " + networks: db_net: driver: bridge @@ -152,5 +165,6 @@ networks: volumes: db_data: search_data: + minio-data: fa-config: minio_storage: {} diff --git a/packages/form-manager/src/app.module.ts b/packages/form-manager/src/app.module.ts index c0c58347ec7cc7ecc2288a6b8157ed8a471c9fcb..1fa36dfc98e91a8b842887dd2b12d7d8a2559a5a 100644 --- a/packages/form-manager/src/app.module.ts +++ b/packages/form-manager/src/app.module.ts @@ -3,7 +3,6 @@ import { AppController } from './app.controller'; import { AppService } from './app.service'; import { ConfigModule, ConfigService } from '@nestjs/config'; import { redisStore } from 'cache-manager-redis-store'; -import type { RedisClientOptions } from 'redis'; @Module({ imports: [