Skip to content

Commit 4a33862

Browse files
committed
Add support for WEBSITE_RUN_FROM_PACKAGE {#3497)
1 parent 08cb762 commit 4a33862

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ public string ZipUrl
2525
{
2626
get
2727
{
28-
if (Environment.ContainsKey(EnvironmentSettingNames.AzureWebsiteAltZipDeployment))
28+
if (Environment.ContainsKey(EnvironmentSettingNames.AzureWebsiteRunFromPackage))
29+
{
30+
return Environment[EnvironmentSettingNames.AzureWebsiteRunFromPackage];
31+
}
32+
else if (Environment.ContainsKey(EnvironmentSettingNames.AzureWebsiteAltZipDeployment))
2933
{
3034
return Environment[EnvironmentSettingNames.AzureWebsiteAltZipDeployment];
3135
}

src/WebJobs.Script/Environment/EnvironmentExtensions.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ public static bool IsRemoteDebuggingEnabled(this IEnvironment environment)
3030

3131
public static bool IsZipDeployment(this IEnvironment environment)
3232
{
33-
return !string.IsNullOrEmpty(environment.GetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteZipDeployment));
33+
return !string.IsNullOrEmpty(environment.GetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteZipDeployment)) ||
34+
!string.IsNullOrEmpty(environment.GetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteAltZipDeployment)) ||
35+
!string.IsNullOrEmpty(environment.GetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteRunFromPackage));
3436
}
3537

3638
public static bool FileSystemIsReadOnly(this IEnvironment environment)

src/WebJobs.Script/Environment/EnvironmentSettingNames.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ public static class EnvironmentSettingNames
1111
public const string AzureWebsiteOwnerName = "WEBSITE_OWNER_NAME";
1212
public const string AzureWebsiteInstanceId = "WEBSITE_INSTANCE_ID";
1313
public const string AzureWebsiteSku = "WEBSITE_SKU";
14-
public const string AzureWebsiteZipDeployment = "WEBSITE_USE_ZIP";
15-
public const string AzureWebsiteAltZipDeployment = "WEBSITE_RUN_FROM_ZIP";
1614
public const string RemoteDebuggingPort = "REMOTEDEBUGGINGPORT";
1715
public const string AzureWebsitePlaceholderMode = "WEBSITE_PLACEHOLDER_MODE";
1816
public const string AzureWebsiteHomePath = "HOME";
@@ -40,5 +38,11 @@ public static class EnvironmentSettingNames
4038

4139
public const string ContainerStartContext = "CONTAINER_START_CONTEXT";
4240
public const string ContainerStartContextSasUri = "CONTAINER_START_CONTEXT_SAS_URI";
41+
42+
// unfortunately there are 3 versions of this setting that have to be supported
43+
// due to renames
44+
public const string AzureWebsiteZipDeployment = "WEBSITE_USE_ZIP";
45+
public const string AzureWebsiteAltZipDeployment = "WEBSITE_RUN_FROM_ZIP";
46+
public const string AzureWebsiteRunFromPackage = "WEBSITE_RUN_FROM_PACKAGE";
4347
}
4448
}

0 commit comments

Comments
 (0)