Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-workflow
Commits
ea4f0dac
Commit
ea4f0dac
authored
1 year ago
by
Tushar
Browse files
Options
Download
Patches
Plain Diff
Type fix app.controller and fix docker-compose.yml
parent
ef15a656
main
dev
feat/centro
feature/formlistapi
revert-67-contributeByGitpod
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.env
+6
-2
.env
.gitpod.yml
+3
-0
.gitpod.yml
docker-compose.yml
+3
-0
docker-compose.yml
packages/form-manager/src/app.controller.ts
+4
-2
packages/form-manager/src/app.controller.ts
with
16 additions
and
4 deletions
+16
-4
.env
+
6
−
2
View file @
ea4f0dac
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
.gitpod.yml
+
3
−
0
View file @
ea4f0dac
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
3
−
0
View file @
ea4f0dac
...
...
@@ -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}
...
...
This diff is collapsed.
Click to expand it.
packages/form-manager/src/app.controller.ts
+
4
−
2
View file @
ea4f0dac
...
...
@@ -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
'
)
});
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets