From 0d80143cbdc4628df582a0e6bec881d17e5b669f Mon Sep 17 00:00:00 2001 From: Jonathan Meyer Date: Thu, 1 Feb 2018 16:51:50 -0500 Subject: [PATCH 1/2] Validation to ensure / does not make it into framework ID (#1684) --- repo/packages/E/eremetic/0/config.json | 3 ++- repo/packages/E/eremetic/0/package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/repo/packages/E/eremetic/0/config.json b/repo/packages/E/eremetic/0/config.json index c5245fef2..90fc2945d 100644 --- a/repo/packages/E/eremetic/0/config.json +++ b/repo/packages/E/eremetic/0/config.json @@ -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", diff --git a/repo/packages/E/eremetic/0/package.json b/repo/packages/E/eremetic/0/package.json index b178c061f..1820cf06f 100644 --- a/repo/packages/E/eremetic/0/package.json +++ b/repo/packages/E/eremetic/0/package.json @@ -9,7 +9,7 @@ } ], "maintainer" : "dcos-support@appliedis.com", - "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!", From 31db744396164385f541d40d48367473dbcba775 Mon Sep 17 00:00:00 2001 From: Jonathan Meyer Date: Thu, 1 Feb 2018 17:09:04 -0500 Subject: [PATCH 2/2] Ensure URL prefix is set to match the deployed Marathon app name --- repo/packages/E/eremetic/0/marathon.json.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo/packages/E/eremetic/0/marathon.json.mustache b/repo/packages/E/eremetic/0/marathon.json.mustache index 12b69f3d8..6bbb44745 100644 --- a/repo/packages/E/eremetic/0/marathon.json.mustache +++ b/repo/packages/E/eremetic/0/marathon.json.mustache @@ -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}}",