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

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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 56 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/build.yml vendored
View File

@ -83,9 +83,6 @@ jobs:
dotnet: true dotnet: true
- service_name: Attachments - service_name: Attachments
base_path: ./util base_path: ./util
- service_name: Billing
base_path: ./src
dotnet: true
- service_name: Events - service_name: Events
base_path: ./src base_path: ./src
dotnet: true dotnet: true
@ -183,7 +180,7 @@ jobs:
echo "Restore" echo "Restore"
dotnet restore dotnet restore
echo "Clean" echo "Clean"
dotnet clean -c "Release" -o obj/Azure/publish dotnet clean -c "Release" -o obj/build-output/publish
- name: Execute Gulp - name: Execute Gulp
if: ${{ matrix.gulp }} if: ${{ matrix.gulp }}
@ -197,9 +194,9 @@ jobs:
working-directory: ${{ matrix.base_path }}/${{ matrix.service_name }} working-directory: ${{ matrix.base_path }}/${{ matrix.service_name }}
run: | run: |
echo "Publish" echo "Publish"
dotnet publish -c "Release" -o obj/Azure/publish dotnet publish -c "Release" -o obj/build-output/publish
cd obj/Azure/publish cd obj/build-output/publish
zip -r ${{ matrix.service_name }}.zip . zip -r ${{ matrix.service_name }}.zip .
mv ${{ matrix.service_name }}.zip ../../../ mv ${{ matrix.service_name }}.zip ../../../
@ -285,12 +282,12 @@ jobs:
echo "Restore" echo "Restore"
dotnet restore dotnet restore
echo "Clean" echo "Clean"
dotnet clean -c "Release" -o obj/Azure/publish dotnet clean -c "Release" -o obj/build-output/publish
echo "Publish" echo "Publish"
dotnet publish -c "Release" -o obj/Azure/publish dotnet publish -c "Release" -o obj/build-output/publish
dotnet swagger tofile --output ../../swagger.json --host https://api.bitwarden.com \ dotnet swagger tofile --output ../../swagger.json --host https://api.bitwarden.com \
./obj/Azure/publish/Api.dll public ./obj/build-output/publish/Api.dll public
cd ../.. cd ../..
env: env:
ASPNETCORE_ENVIRONMENT: Production ASPNETCORE_ENVIRONMENT: Production

6
.github/workflows/prod-deploy.yml vendored
View File

@ -120,7 +120,7 @@ jobs:
echo "Restore" echo "Restore"
dotnet restore $SERVICE_NAME.csproj dotnet restore $SERVICE_NAME.csproj
echo "Clean" echo "Clean"
dotnet clean $SERVICE_NAME.csproj -c "Release" -o obj/Azure/publish dotnet clean $SERVICE_NAME.csproj -c "Release" -o obj/build-output/publish
if [ "$GULP" == "true" ]; then if [ "$GULP" == "true" ]; then
npm install npm install
@ -129,9 +129,9 @@ jobs:
fi fi
echo "Publish" echo "Publish"
dotnet publish $SERVICE_NAME.csproj -c "Release" -o obj/Azure/publish dotnet publish $SERVICE_NAME.csproj -c "Release" -o obj/build-output/publish
cd obj/Azure/publish cd obj/build-output/publish
zip -r $SERVICE_NAME.zip . zip -r $SERVICE_NAME.zip .
mv $SERVICE_NAME.zip ../../../ mv $SERVICE_NAME.zip ../../../
env: env:

6
.github/workflows/qa-deploy.yml vendored
View File

@ -72,7 +72,7 @@ jobs:
echo "Restore" echo "Restore"
dotnet restore $SERVICE_NAME.csproj dotnet restore $SERVICE_NAME.csproj
echo "Clean" echo "Clean"
dotnet clean $SERVICE_NAME.csproj -c "Release" -o obj/Azure/publish dotnet clean $SERVICE_NAME.csproj -c "Release" -o obj/build-output/publish
if [ "$GULP" == "true" ]; then if [ "$GULP" == "true" ]; then
npm install npm install
@ -81,9 +81,9 @@ jobs:
fi fi
echo "Publish" echo "Publish"
dotnet publish $SERVICE_NAME.csproj -c "Release" -o obj/Azure/publish dotnet publish $SERVICE_NAME.csproj -c "Release" -o obj/build-output/publish
cd obj/Azure/publish cd obj/build-output/publish
zip -r $SERVICE_NAME.zip . zip -r $SERVICE_NAME.zip .
mv $SERVICE_NAME.zip ../../../ mv $SERVICE_NAME.zip ../../../
env: env:

6
.github/workflows/release.yml vendored
View File

@ -183,12 +183,12 @@ jobs:
echo "Restore" echo "Restore"
dotnet restore dotnet restore
echo "Clean" echo "Clean"
dotnet clean -c "Release" -o obj/Azure/publish dotnet clean -c "Release" -o obj/build-output/publish
echo "Publish" echo "Publish"
dotnet publish -c "Release" -o obj/Azure/publish dotnet publish -c "Release" -o obj/build-output/publish
dotnet swagger tofile --output ../../swagger.json --host https://api.bitwarden.com \ dotnet swagger tofile --output ../../swagger.json --host https://api.bitwarden.com \
./obj/Azure/publish/Api.dll public ./obj/build-output/publish/Api.dll public
cd ../.. cd ../..
env: env:
ASPNETCORE_ENVIRONMENT: Production ASPNETCORE_ENVIRONMENT: Production

2
bitwarden_license/src/Portal/Dockerfile
View File

@ -11,7 +11,7 @@ RUN apt-get update \
ENV ASPNETCORE_URLS http://+:5000 ENV ASPNETCORE_URLS http://+:5000
WORKDIR /app WORKDIR /app
EXPOSE 5000 EXPOSE 5000
COPY obj/Docker/publish . COPY obj/build-output/publish .
COPY entrypoint.sh / COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh

4
bitwarden_license/src/Portal/build.sh
View File

@ -11,14 +11,14 @@ echo ".NET Core version $(dotnet --version)"
echo "Restore" echo "Restore"
dotnet restore "$DIR/Portal.csproj" dotnet restore "$DIR/Portal.csproj"
echo "Clean" echo "Clean"
dotnet clean "$DIR/Portal.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet clean "$DIR/Portal.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo "Node Build" echo "Node Build"
cd "$DIR" cd "$DIR"
npm install npm install
cd "$CUR_DIR" cd "$CUR_DIR"
gulp --gulpfile "$DIR/gulpfile.js" build gulp --gulpfile "$DIR/gulpfile.js" build
echo "Publish" echo "Publish"
dotnet publish "$DIR/Portal.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet publish "$DIR/Portal.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo -e "\nBuilding docker image" echo -e "\nBuilding docker image"
docker --version docker --version

2
bitwarden_license/src/Sso/Dockerfile
View File

@ -11,7 +11,7 @@ RUN apt-get update \
ENV ASPNETCORE_URLS http://+:5000 ENV ASPNETCORE_URLS http://+:5000
WORKDIR /app WORKDIR /app
EXPOSE 5000 EXPOSE 5000
COPY obj/Docker/publish . COPY obj/build-output/publish .
COPY entrypoint.sh / COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh

4
bitwarden_license/src/Sso/build.sh
View File

@ -11,14 +11,14 @@ echo ".NET Core version $(dotnet --version)"
echo "Restore" echo "Restore"
dotnet restore "$DIR/Sso.csproj" dotnet restore "$DIR/Sso.csproj"
echo "Clean" echo "Clean"
dotnet clean "$DIR/Sso.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet clean "$DIR/Sso.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo "Node Build" echo "Node Build"
cd "$DIR" cd "$DIR"
npm install npm install
cd "$CUR_DIR" cd "$CUR_DIR"
gulp --gulpfile "$DIR/gulpfile.js" build gulp --gulpfile "$DIR/gulpfile.js" build
echo "Publish" echo "Publish"
dotnet publish "$DIR/Sso.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet publish "$DIR/Sso.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo -e "\nBuilding docker image" echo -e "\nBuilding docker image"
docker --version docker --version

2
src/Admin/.dockerignore
View File

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

2
src/Admin/Dockerfile
View File

@ -11,7 +11,7 @@ RUN apt-get update \
ENV ASPNETCORE_URLS http://+:5000 ENV ASPNETCORE_URLS http://+:5000
WORKDIR /app WORKDIR /app
EXPOSE 5000 EXPOSE 5000
COPY obj/Docker/publish . COPY obj/build-output/publish .
COPY entrypoint.sh / COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh

4
src/Admin/build.sh
View File

@ -11,14 +11,14 @@ echo ".NET Core version $(dotnet --version)"
echo "Restore" echo "Restore"
dotnet restore "$DIR/Admin.csproj" dotnet restore "$DIR/Admin.csproj"
echo "Clean" echo "Clean"
dotnet clean "$DIR/Admin.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet clean "$DIR/Admin.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo "Node Build" echo "Node Build"
cd "$DIR" cd "$DIR"
npm install npm install
cd "$CUR_DIR" cd "$CUR_DIR"
gulp --gulpfile "$DIR/gulpfile.js" build gulp --gulpfile "$DIR/gulpfile.js" build
echo "Publish" echo "Publish"
dotnet publish "$DIR/Admin.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet publish "$DIR/Admin.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo -e "\nBuilding docker image" echo -e "\nBuilding docker image"
docker --version docker --version

2
src/Api/.dockerignore
View File

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

2
src/Api/Dockerfile
View File

@ -11,7 +11,7 @@ RUN apt-get update \
ENV ASPNETCORE_URLS http://+:5000 ENV ASPNETCORE_URLS http://+:5000
WORKDIR /app WORKDIR /app
EXPOSE 5000 EXPOSE 5000
COPY obj/Docker/publish/Api . COPY obj/build-output/publish/Api .
COPY entrypoint.sh / COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh

4
src/Api/build.sh
View File

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

2
src/Events/.dockerignore
View File

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

2
src/Events/Dockerfile
View File

@ -11,7 +11,7 @@ RUN apt-get update \
ENV ASPNETCORE_URLS http://+:5000 ENV ASPNETCORE_URLS http://+:5000
WORKDIR /app WORKDIR /app
EXPOSE 5000 EXPOSE 5000
COPY obj/Docker/publish/Events . COPY obj/build-output/publish/Events .
COPY entrypoint.sh / COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh

4
src/Events/build.sh
View File

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

2
src/EventsProcessor/Dockerfile
View File

@ -11,7 +11,7 @@ RUN apt-get update \
ENV ASPNETCORE_URLS http://+:5000 ENV ASPNETCORE_URLS http://+:5000
WORKDIR /app WORKDIR /app
EXPOSE 5000 EXPOSE 5000
COPY obj/Docker/publish . COPY obj/build-output/publish .
COPY entrypoint.sh / COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh

4
src/EventsProcessor/build.sh
View File

@ -10,9 +10,9 @@ echo ".NET Core version $(dotnet --version)"
echo "Restore" echo "Restore"
dotnet restore "$DIR/EventsProcessor.csproj" dotnet restore "$DIR/EventsProcessor.csproj"
echo "Clean" echo "Clean"
dotnet clean "$DIR/EventsProcessor.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet clean "$DIR/EventsProcessor.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo "Publish" echo "Publish"
dotnet publish "$DIR/EventsProcessor.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet publish "$DIR/EventsProcessor.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
if [ "$1" != "nodocker" ] if [ "$1" != "nodocker" ]
then then

2
src/Icons/.dockerignore
View File

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

2
src/Icons/Dockerfile
View File

@ -11,7 +11,7 @@ RUN apt-get update \
ENV ASPNETCORE_URLS http://+:5000 ENV ASPNETCORE_URLS http://+:5000
WORKDIR /app WORKDIR /app
EXPOSE 5000 EXPOSE 5000
COPY obj/Docker/publish . COPY obj/build-output/publish .
COPY entrypoint.sh / COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh

4
src/Icons/build.sh
View File

@ -10,9 +10,9 @@ echo ".NET Core version $(dotnet --version)"
echo "Restore" echo "Restore"
dotnet restore "$DIR/Icons.csproj" dotnet restore "$DIR/Icons.csproj"
echo "Clean" echo "Clean"
dotnet clean "$DIR/Icons.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet clean "$DIR/Icons.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo "Publish" echo "Publish"
dotnet publish "$DIR/Icons.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet publish "$DIR/Icons.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
if [ "$1" != "nodocker" ] if [ "$1" != "nodocker" ]
then then

2
src/Identity/.dockerignore
View File

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

2
src/Identity/Dockerfile
View File

@ -11,7 +11,7 @@ RUN apt-get update \
ENV ASPNETCORE_URLS http://+:5000 ENV ASPNETCORE_URLS http://+:5000
WORKDIR /app WORKDIR /app
EXPOSE 5000 EXPOSE 5000
COPY obj/Docker/publish . COPY obj/build-output/publish .
COPY entrypoint.sh / COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh

4
src/Identity/build.sh
View File

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

2
src/Notifications/.dockerignore
View File

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

2
src/Notifications/Dockerfile
View File

@ -11,7 +11,7 @@ RUN apt-get update \
ENV ASPNETCORE_URLS http://+:5000 ENV ASPNETCORE_URLS http://+:5000
WORKDIR /app WORKDIR /app
EXPOSE 5000 EXPOSE 5000
COPY obj/Docker/publish . COPY obj/build-output/publish .
COPY entrypoint.sh / COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh

4
src/Notifications/build.sh
View File

@ -10,9 +10,9 @@ echo ".NET Core version $(dotnet --version)"
echo "Restore" echo "Restore"
dotnet restore "$DIR/Notifications.csproj" dotnet restore "$DIR/Notifications.csproj"
echo "Clean" echo "Clean"
dotnet clean "$DIR/Notifications.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet clean "$DIR/Notifications.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
echo "Publish" echo "Publish"
dotnet publish "$DIR/Notifications.csproj" -c "Release" -o "$DIR/obj/Docker/publish" dotnet publish "$DIR/Notifications.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
if [ "$1" != "nodocker" ] if [ "$1" != "nodocker" ]
then then

2
util/Server/.dockerignore
View File

@ -1,3 +1,3 @@
* *
!obj/Docker/publish/* !obj/build-output/publish/*
!obj/Docker/empty/ !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" 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" echo "Restore"
dotnet restore "$DIR/Server.csproj" dotnet restore "$DIR/Server.csproj"
echo "Clean" 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" 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" echo -e "\nBuilding docker image"
docker --version docker --version

2
util/Setup/.dockerignore
View File

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

2
util/Setup/Dockerfile
View File

@ -9,7 +9,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
WORKDIR /app WORKDIR /app
COPY obj/Docker/publish . COPY obj/build-output/publish .
COPY entrypoint.sh / COPY entrypoint.sh /
RUN chmod +x /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" echo "Restore"
dotnet restore "$DIR/Setup.csproj" dotnet restore "$DIR/Setup.csproj"
echo "Clean" 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" 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" echo -e "\nBuilding docker image"
docker --version docker --version