Merge branch 'master' into feature/files

This commit is contained in:
pavelbannov 2020-06-26 12:41:45 +03:00
commit 943bd44458
2 changed files with 8 additions and 3 deletions

View File

@ -61,12 +61,12 @@ namespace ASC.Thumbnails.Svc
}
)
.AddJsonFile("appsettings.json")
.AddJsonFile($"appsettings.{env}.json", true)
.AddJsonFile($"urlshortener.{env}.json", true)
.AddJsonFile("storage.json")
.AddJsonFile("kafka.json")
.AddJsonFile("thumb.json")
.AddJsonFile($"kafka.{env}.json", true)
.AddJsonFile($"appsettings.{env}.json", true)
.AddJsonFile($"thumb.{env}.json", true)
.AddEnvironmentVariables()
.AddCommandLine(args);
})

5
config/thumb.test.json Normal file
View File

@ -0,0 +1,5 @@
{
"thumb": {
"path": "../client/index.js"
}
}