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
ef15a656
Commit
ef15a656
authored
1 year ago
by
Tushar
Browse files
Options
Download
Patches
Plain Diff
Fix docker-compose.yml, refactor .env and form-manager
parent
047a7b5c
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
+2
-1
.env
.gitpod.yml
+2
-1
.gitpod.yml
docker-compose.yml
+1
-1
docker-compose.yml
packages/form-manager/src/app.controller.ts
+1
-2
packages/form-manager/src/app.controller.ts
with
6 additions
and
5 deletions
+6
-5
.env
+
2
−
1
View file @
ef15a656
...
...
@@ -16,9 +16,10 @@ CENTRAL_USER_PASS=StrongPassword@1234
#enketo-express
ENCRYPTION_KEY=somestrongencrytionkey
LESS_SECURE_ENCRYPTION_KEY=ssssomestrongencrytionkey
FORM_MANAGER_BASE_URI=3006-tushar5526-workflow-to0ynmrsh3d.ws-us93.gitpod.io
# form manager
FORM_MANAGER_URL=http://form-manager:3006
MINIO_URL=http://minio:9000
REDIS_HOST=fm-cache
REDIS_PORT=6379
...
...
This diff is collapsed.
Click to expand it.
.gitpod.yml
+
2
−
1
View file @
ef15a656
...
...
@@ -18,7 +18,8 @@ tasks:
openMode
:
tab-after
init
:
|
gp sync-done dev-setup
sed -i~ "/^FORM_MANAGER_BASE_URI=/s/=.*/=3006-${GITPOD_WORKSPACE_URL:8}/" .env
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
docker-compose up -d
gp sync-done setup
-
name
:
Setup React Wrapper
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
1
−
1
View file @
ef15a656
...
...
@@ -166,7 +166,7 @@ services:
REDIS_MAIN_PORT
:
6379
REDIS_CACHE_HOST
:
redis_cache
REDIS_CACHE_PORT
:
6379
FORM_MANAGER_BASE_URI
:
${FORM_MANAGER_
BASE_
UR
I
}
FORM_MANAGER_BASE_URI
:
${FORM_MANAGER_UR
L
}
fm-cache
:
image
:
redis:7
...
...
This diff is collapsed.
Click to expand it.
packages/form-manager/src/app.controller.ts
+
1
−
2
View file @
ef15a656
...
...
@@ -47,7 +47,6 @@ 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
'
);
...
...
@@ -271,7 +270,7 @@ export class AppController {
// console.log('sessionRes', sessionRes);
const
minioClient
:
Client
=
new
Minio
.
Client
({
endPoint
:
this
.
MINIO_
ENDPOINT
,
endPoint
:
this
.
MINIO_
URL
,
useSSL
:
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