Commit ef15a656 authored by Tushar's avatar Tushar
Browse files

Fix docker-compose.yml, refactor .env and form-manager

Showing with 6 additions and 5 deletions
+6 -5
......@@ -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
......
......@@ -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
......
......@@ -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_URI}
FORM_MANAGER_BASE_URI: ${FORM_MANAGER_URL}
fm-cache:
image: redis:7
......
......@@ -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')
......
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