Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Eremetic framework fix #1688

Merged
merged 2 commits into from
Feb 2, 2018
Merged

Eremetic framework fix #1688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d80143
Validation to ensure / does not make it into framework ID (#1684)
gisjedi Feb 1, 2018
31db744
Ensure URL prefix is set to match the deployed Marathon app name
gisjedi Feb 1, 2018
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
3 changes: 2 additions & 1 deletion repo/packages/E/eremetic/0/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"framework-name": {
"description": "The name of the Eremetic scheduler and service instance",
"type": "string",
"default": "eremetic"
"default": "eremetic",
"pattern": "^[a-zA-Z0-9-]+$"
},
"cpus": {
"description": "Number of cores allocated to Eremetic instance",
Expand Down
4 changes: 2 additions & 2 deletions repo/packages/E/eremetic/0/marathon.json.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"DATABASE_DRIVER": "zk",
"LOGLEVEL": "{{eremetic.log-level}}",
"QUEUE_SIZE": "{{eremetic.queue-size}}",
"FRAMEWORK_ID": "{{eremetic.framework-name}}1",
"URL_PREFIX": "/service/eremetic"
"FRAMEWORK_ID": "{{eremetic.framework-name}}",
"URL_PREFIX": "/service/{{eremetic.framework-name}}"
},
"labels": {
"DCOS_PACKAGE_FRAMEWORK_NAME": "{{eremetic.framework-name}}",
Expand Down
2 changes: 1 addition & 1 deletion repo/packages/E/eremetic/0/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
],
"maintainer" : "[email protected]",
"minDcosReleaseVersion": "999",
"minDcosReleaseVersion": "1.8",
"name": "eremetic",
"packagingVersion": "3.0",
"preInstallNotes": "This DC/OS Service is currently in preview. There may be bugs, incomplete features, incorrect documentation, or other discrepancies. Preview packages should never be used in production!",
Expand Down