IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Getting STORAGE_ROOT from env variable

Browse Source
This commit is contained in:
pavelbannov 2019-09-09 18:04:28 +03:00
parent 422ed49134
commit 0a5ef37043
11 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/run/NotifyService.bat
View File

@ -1,2 +1,2 @@
echo "RUN ASC.Notify"
call dotnet run --project ..\..\common\services\ASC.Notify\ASC.Notify.csproj --no-build
call dotnet run --project ..\..\common\services\ASC.Notify\ASC.Notify.csproj --no-build --$STORAGE_ROOT=..\..\Data

2
build/run/PeopleServer.bat
View File

@ -1,2 +1,2 @@
echo "RUN ASC.People"
call dotnet run --project ..\..\products\ASC.People\Server\ASC.People.csproj --no-build
call dotnet run --project ..\..\products\ASC.People\Server\ASC.People.csproj --no-build --$STORAGE_ROOT=..\..\Data

2
build/run/StudioNotifyService.bat
View File

@ -1,2 +1,2 @@
echo "RUN ASC.Studio.Notify"
call dotnet run --project ..\..\common\services\ASC.Studio.Notify\ASC.Studio.Notify.csproj --no-build
call dotnet run --project ..\..\common\services\ASC.Studio.Notify\ASC.Studio.Notify.csproj --no-build --$STORAGE_ROOT=..\..\Data

2
build/run/WebApi.bat
View File

@ -1,2 +1,2 @@
echo "RUN ASC.Web.Api"
call dotnet run --project ..\..\web\ASC.Web.Api\ASC.Web.Api.csproj --no-build
call dotnet run --project ..\..\web\ASC.Web.Api\ASC.Web.Api.csproj --no-build --$STORAGE_ROOT=..\..\Data

2
build/run/WebStudio.bat
View File

@ -1,2 +1,2 @@
echo "RUN ASC.Web.Studio"
call dotnet run --project ..\..\web\ASC.Web.Studio\ASC.Web.Studio.csproj --no-build
call dotnet run --project ..\..\web\ASC.Web.Studio\ASC.Web.Studio.csproj --no-build --$STORAGE_ROOT=..\..\Data

9
common/ASC.Data.Storage/PathUtils.cs
View File

@ -28,12 +28,19 @@ using System;
using System.Collections.Generic;
using System.IO;
using ASC.Common.DependencyInjection;
using ASC.Common.Utils;
using Microsoft.AspNetCore.Hosting;
namespace ASC.Data.Storage
{
class PathUtils
{
private static string StorageRoot { get; }
static PathUtils()
{
StorageRoot = ConfigurationManager.AppSettings[Constants.STORAGE_ROOT_PARAM];
}
public static string Normalize(string path, bool addTailingSeparator = false)
{
path = path
@ -90,7 +97,7 @@ namespace ASC.Data.Storage
if (physPath.Contains(Constants.STORAGE_ROOT_PARAM))
{
physPath = physPath.Replace(Constants.STORAGE_ROOT_PARAM, storageConfig[Constants.STORAGE_ROOT_PARAM]);
physPath = physPath.Replace(Constants.STORAGE_ROOT_PARAM, StorageRoot ?? storageConfig[Constants.STORAGE_ROOT_PARAM]);
}
if (!Path.IsPathRooted(physPath))

6
common/services/ASC.Notify/Properties/launchSettings.json
View File

@ -12,14 +12,16 @@
"commandName": "IISExpress",
"launchBrowser": false,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../../../../Data"
}
},
"ASC.Notify": {
"commandName": "Project",
"launchBrowser": false,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../../../../Data"
},
"applicationUrl": "http://localhost:5005/"
}

6
common/services/ASC.Studio.Notify/Properties/launchSettings.json
View File

@ -12,14 +12,16 @@
"commandName": "IISExpress",
"launchBrowser": false,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../../../../Data"
}
},
"ASC.Studio.Notify": {
"commandName": "Project",
"launchBrowser": false,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../../../../Data"
},
"applicationUrl": "http://localhost:5006/"
}

6
products/ASC.People/Server/Properties/launchSettings.json
View File

@ -12,7 +12,8 @@
"commandName": "IISExpress",
"launchBrowser": false,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../../../../Data"
}
},
"ASC.People": {
@ -20,7 +21,8 @@
"launchBrowser": false,
"applicationUrl": "http://localhost:5004",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../../../../Data"
}
}
}

12
web/ASC.Web.Api/Properties/launchSettings.json
View File

@ -12,13 +12,21 @@
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": false,
"launchUrl": "api/modules"
"launchUrl": "api/modules",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../../../Data"
}
},
"ASC.Web.Api": {
"commandName": "Project",
"launchBrowser": false,
"launchUrl": "api/modules",
"applicationUrl": "http://localhost:5000"
"applicationUrl": "http://localhost:5000",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../../../Data"
}
}
}
}

6
web/ASC.Web.Studio/Properties/launchSettings.json
View File

@ -12,14 +12,16 @@
"commandName": "IISExpress",
"launchBrowser": false,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../../../Data"
}
},
"ASC.Web.Studio": {
"commandName": "Project",
"launchBrowser": false,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../../../Data"
},
"applicationUrl": "http://localhost:5003"
}