fix for dockerhost HELIUM

This commit is contained in:
=Corey Hulen
2015-06-18 10:55:51 -08:00
parent c4788e0473
commit 4cabe1baea
5 changed files with 19 additions and 4 deletions

View File

@@ -303,6 +303,10 @@ func IsTestDomain(r *http.Request) bool {
return true
}
if strings.Index(r.Host, "dockerhost") == 0 {
return true
}
if strings.Index(r.Host, "test") == 0 {
return true
}

View File

@@ -1,7 +1,7 @@
{
"LogSettings": {
"ConsoleEnable": false,
"ConsoleLevel": "DEBUG",
"ConsoleEnable": true,
"ConsoleLevel": "INFO",
"FileEnable": true,
"FileLevel": "INFO",
"FileFormat": "",

View File

@@ -160,6 +160,7 @@ var reservedDomains = []string{
"channel",
"internal",
"localhost",
"dockerhost",
"stag",
"post",
"cluster",

View File

@@ -61,6 +61,7 @@ module.exports = {
"channel",
"internal",
"localhost",
"dockerhost",
"stag",
"post",
"cluster",

View File

@@ -28,6 +28,9 @@ module.exports.isTestDomain = function() {
if ((/^localhost/).test(window.location.hostname))
return true;
if ((/^dockerhost/).test(window.location.hostname))
return true;
if ((/^test/).test(window.location.hostname))
return true;
@@ -75,8 +78,14 @@ module.exports.getDomainWithOutSub = function() {
var parts = window.location.host.split(".");
if (parts.length == 1)
return "localhost:8065";
if (parts.length == 1) {
if (parts[0].indexOf("dockerhost") > -1) {
return "dockerhost:8065";
}
else {
return "localhost:8065";
}
}
return parts[1] + "." + parts[2];
}