Commit ea4f0dac authored by Tushar's avatar Tushar
Browse files

Type fix app.controller and fix docker-compose.yml

Showing with 16 additions and 4 deletions
+16 -4
......@@ -5,6 +5,7 @@ DATABASE_PASSWORD=hkaLBM3RVnyYeYeqE3WI1w2e4Avpy0Wd5O3s3
ES_JAVA_OPTS="-Xms512m -Xmx512m"
FUSIONAUTH_APP_MEMORY=512M
#minio
MINIO_USERNAME=workflow-dev
MINIO_PASSWORD=workflow-dev
MINIO_BUCKETNAME=affiliationbucket
......@@ -18,9 +19,12 @@ ENCRYPTION_KEY=somestrongencrytionkey
LESS_SECURE_ENCRYPTION_KEY=ssssomestrongencrytionkey
# form manager
FORM_MANAGER_URL=http://form-manager:3006
MINIO_URL=http://minio:9000
FORM_MANAGER_URL=https://3006-tushar5526-workflow-fnu74wzypyq.ws-us93.gitpod.io
MINIO_URL=https://9000-tushar5526-workflow-fnu74wzypyq.ws-us93.gitpod.io
MINIO_ENDPOINT=minio
MINIO_PORT=9000
REDIS_HOST=fm-cache
MINIO_USE_SSL=false
REDIS_PORT=6379
# TSDB
......
......@@ -20,6 +20,9 @@ tasks:
gp sync-done dev-setup
sed -i~ "/^FORM_MANAGER_URL=/s/=.*/=https\:\/\/3006-${GITPOD_WORKSPACE_URL:8}/" .env
sed -i~ "/^MINIO_URL=/s/=.*/=https\:\/\/9000-${GITPOD_WORKSPACE_URL:8}/" .env
sed -i~ "/^MINIO_ENDPOINT=/s/=.*/=9000-${GITPOD_WORKSPACE_URL:8}/" .env
sed -i~ "/^MINIO_PORT=/s/=.*/=80/" .env
sed -i~ "/^MINIO_USE_SSL=/s/=.*/=true/" .env
docker-compose up -d
gp sync-done setup
- name: Setup React Wrapper
......
......@@ -185,6 +185,9 @@ services:
- 3006:3006
environment:
MINIO_USERNAME: ${MINIO_USERNAME}
MINIO_ENDPOINT: ${MINIO_ENDPOINT}
MINIO_PORT: ${MINIO_PORT}
MINIO_URL: ${MINIO_URL}
MINIO_PASSWORD: ${MINIO_PASSWORD}
MINIO_BUCKETNAME: ${MINIO_BUCKETNAME}
REDIS_HOST: ${REDIS_HOST}
......
......@@ -47,6 +47,7 @@ export class AppController {
private configService: ConfigService,
) { }
MINIO_ENDPOINT = this.configService.get('MINIO_ENDPOINT');
MINIO_URL = this.configService.get('MINIO_URL');
FORM_MANAGER_URL = this.configService.get('FORM_MANAGER_URL');
......@@ -270,8 +271,9 @@ export class AppController {
// console.log('sessionRes', sessionRes);
const minioClient: Client = new Minio.Client({
endPoint: this.MINIO_URL,
useSSL: true,
endPoint: this.MINIO_ENDPOINT,
port: parseInt(this.configService.get('MINIO_PORT')),
useSSL: this.configService.get('MINIO_USE_SSL') === true,
accessKey: this.configService.get('MINIO_USERNAME'),
secretKey: this.configService.get('MINIO_PASSWORD')
});
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment