nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 07:36:14 -05:00
Code Activity

Update output directory for dotnet builds (#1358)

Browse Source 
* Update output directory for dotnet builds

* Update Dotnet build output path
This commit is contained in:
Vince Grassia
2021-05-27 12:16:12 -04:00
committed by GitHub
parent fffdd17915
commit 21003c61ab
34 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/Server/.dockerignore
View File

@ -1,3 +1,3 @@
*
!obj/Docker/publish/*
!obj/build-output/publish/*
!obj/Docker/empty/

2
util/Server/Dockerfile
View File

@ -2,4 +2,4 @@ FROM mcr.microsoft.com/dotnet/core/aspnet:3.1
LABEL com.bitwarden.product="bitwarden"
COPY obj/Docker/publish /bitwarden_server
COPY obj/build-output/publish /bitwarden_server

4
util/Server/build.sh
View File

@ -10,9 +10,9 @@ echo ".NET Core version $(dotnet --version)"
echo "Restore"
dotnet restore "$DIR/Server.csproj"
echo "Clean"
dotnet clean "$DIR/Server.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
dotnet clean "$DIR/Server.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo "Publish"
dotnet publish "$DIR/Server.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
dotnet publish "$DIR/Server.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo -e "\nBuilding docker image"
docker --version

2
util/Setup/.dockerignore
View File

@ -1,4 +1,4 @@
*
!obj/Docker/publish/*
!obj/build-output/publish/*
!obj/Docker/empty/
!entrypoint.sh

2
util/Setup/Dockerfile
View File

@ -9,7 +9,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY obj/Docker/publish .
COPY obj/build-output/publish .
COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh

4
util/Setup/build.sh
View File

@ -10,9 +10,9 @@ echo ".NET Core version $(dotnet --version)"
echo "Restore"
dotnet restore "$DIR/Setup.csproj"
echo "Clean"
dotnet clean "$DIR/Setup.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
dotnet clean "$DIR/Setup.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo "Publish"
dotnet publish "$DIR/Setup.csproj" -c "Release" -o "$DIR/obj/Docker/publish"
dotnet publish "$DIR/Setup.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo -e "\nBuilding docker image"
docker --version