From ea4f0dac4975738e365044f81d3ac5260b11b6fe Mon Sep 17 00:00:00 2001
From: Tushar <codingid6@gmail.com>
Date: Tue, 11 Apr 2023 12:47:41 +0000
Subject: [PATCH] Type fix app.controller and fix docker-compose.yml
---
.env | 8 ++++++--
.gitpod.yml | 3 +++
docker-compose.yml | 3 +++
packages/form-manager/src/app.controller.ts | 6 ++++--
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/.env b/.env
index 400d7f9..f9d52fe 100644
--- a/.env
+++ b/.env
@@ -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
diff --git a/.gitpod.yml b/.gitpod.yml
index 7409835..6d3e907 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -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
diff --git a/docker-compose.yml b/docker-compose.yml
index a385540..94e0a0b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -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}
diff --git a/packages/form-manager/src/app.controller.ts b/packages/form-manager/src/app.controller.ts
index e5d08f4..c8d914c 100644
--- a/packages/form-manager/src/app.controller.ts
+++ b/packages/form-manager/src/app.controller.ts
@@ -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')
});
--
GitLab