Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PLAT-200 jsr config importing #44

Merged
merged 31 commits into from
Apr 28, 2022
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
626a66d
Introduce config-importing service
Mark-Labuschagne Apr 14, 2022
c001db6
Update JSR to use new config importing strategy
Mark-Labuschagne Apr 14, 2022
bd07458
Add config compose file and base export file
Mark-Labuschagne Apr 14, 2022
2b933c4
Remove unnecessary code from compose file
Mark-Labuschagne Apr 14, 2022
f139632
Code changes to swarm.sh
Mark-Labuschagne Apr 14, 2022
505e1b4
Update JSR to remove config importer and configs
Mark-Labuschagne Apr 14, 2022
37a94fd
Introduce timeout check as library
Mark-Labuschagne Apr 19, 2022
d487ae9
Update config::timeout_check docs
Mark-Labuschagne Apr 19, 2022
9bdc2f1
Remove config importer service from platform
Mark-Labuschagne Apr 19, 2022
0de61d7
Add SSL env var to .env.dev
Mark-Labuschagne Apr 19, 2022
24ef18f
Update SSL default value
Mark-Labuschagne Apr 19, 2022
397c271
Update SSL env var name
Mark-Labuschagne Apr 20, 2022
25d69d2
Remove missed testing code
Mark-Labuschagne Apr 20, 2022
906e216
Update config importer compose file
Mark-Labuschagne Apr 21, 2022
4b6b71a
Update docker-compose.config.yml
Mark-Labuschagne Apr 21, 2022
3e8d0f4
Updated default value for SSL env var
Mark-Labuschagne Apr 21, 2022
21afae4
Added default values for timeout_check
Mark-Labuschagne Apr 21, 2022
c4d19f3
Update default times for timeout_check
Mark-Labuschagne Apr 21, 2022
0fadd38
Update defaults for timeout_check
Mark-Labuschagne Apr 22, 2022
c7f9e9a
Removed overriding values for timeout_check
Mark-Labuschagne Apr 22, 2022
f3de70b
Fixed documentation for timeout_check
Mark-Labuschagne Apr 22, 2022
4a37fbe
Updated package-metadata.json for jsreport
Mark-Labuschagne Apr 25, 2022
3cfa3be
Updated JSR-config-importer image tag
Mark-Labuschagne Apr 25, 2022
c0c2255
Update metadata.json file in JSR
Mark-Labuschagne Apr 25, 2022
22d8054
Updated variable name to match env vars
Mark-Labuschagne Apr 26, 2022
9512b9a
Update vars names to match
Mark-Labuschagne Apr 26, 2022
0befd53
Update compose file
Mark-Labuschagne Apr 26, 2022
323db1a
Update JSR env vars
Mark-Labuschagne Apr 26, 2022
4d30fe1
Merge branch 'main' into PLAT-200-jsr-config-importing
tumbledwyer Apr 26, 2022
b64b8bc
Corrected mispelling of ES package
Mark-Labuschagne Apr 28, 2022
b82bcb1
Updated package-metadata.json to include correct name
Mark-Labuschagne Apr 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update docker-compose.config.yml
To environment variables to use the BODY_DATA_FORMAT instead of making
the config importer specific to a particular service
PLAT-200
Mark-Labuschagne committed Apr 21, 2022
commit 4b6b71a9394e6b50e79ba962205d64914300c0c9
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ services:
API_PASSWORD: ${JS_REPORT:-dev_password_only}
JS_REPORT_SSL: ${JS_REPORT_SSL:-true}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldnt this be:

Suggested change
JS_REPORT_SSL: ${JS_REPORT_SSL:-true}
SSL : ${JS_REPORT_SSL:-true}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it definitely should be. Done in 9512b9a

API_PATH: '/api/import'
CALLER_ID: 'jsr_config_importer'
BODY_DATA_FORMAT: 'multipart/form-data'
deploy:
replicas: 1
restart_policy: