Browse Source

Merge pull request #13837 from abpframework/Ignor-Docker-appsettings

Cli: Ignore appsettings.json in docker directory when generating appsettings.secrets.json
pull/13838/head
Galip Tolga Erdem 4 years ago
committed by GitHub
parent
commit
58fcc03633
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs

7
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateAppSettingsSecretsStep.cs

@ -11,7 +11,7 @@ public class CreateAppSettingsSecretsStep : ProjectBuildPipelineStep
public override void Execute(ProjectBuildContext context) public override void Execute(ProjectBuildContext context)
{ {
var appSettingsFiles = context.Files var appSettingsFiles = context.Files
.Where(x => x.Name.EndsWith(CliConsts.AppSettingsJsonFileName) && NotBlazorWasmProject(x.Name)) .Where(x => x.Name.EndsWith(CliConsts.AppSettingsJsonFileName) && NotBlazorWasmProject(x.Name) && NotInDockerFiles(x.Name))
.ToList(); .ToList();
if (!appSettingsFiles.Any()) if (!appSettingsFiles.Any())
@ -66,6 +66,11 @@ public class CreateAppSettingsSecretsStep : ProjectBuildPipelineStep
return !fileName.Contains("Blazor/wwwroot") && !fileName.Contains("Blazor.Host/wwwroot"); return !fileName.Contains("Blazor/wwwroot") && !fileName.Contains("Blazor.Host/wwwroot");
} }
private static bool NotInDockerFiles(string fileName)
{
return !fileName.Contains("etc/docker/");
}
private static string ReplaceAppSettingsSecretsPlaceholder(string content) private static string ReplaceAppSettingsSecretsPlaceholder(string content)
{ {
var path = string.Empty; var path = string.Empty;

Loading…
Cancel
Save