Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00
Code Issues Projects Releases Wiki Activity

build node assets and no trailing admin slash

Browse Source
This commit is contained in:
Kyle Spearrin 2018-03-25 00:16:26 -04:00
parent 1087328248
commit 15b1a426e4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Admin/build.sh Normal file → Executable file
View File

@ -9,6 +9,9 @@ echo -e "\nBuilding app"
echo ".NET Core version $(dotnet --version)"
echo "Clean"
dotnet clean $DIR/Admin.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
echo "Node Build"
npm --prefix $DIR install $DIR
gulp --gulpfile $DIR/gulpfile.js build
echo "Publish"
dotnet publish $DIR/Admin.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish

4
util/Setup/NginxConfigBuilder.cs
View File

@ -194,8 +194,8 @@ server {{
proxy_pass http://icons/;
}}
location /admin/ {{
proxy_pass http://admin:5000/admin/;
location /admin {{
proxy_pass http://admin:5000;
}}
}}");
}