diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69f83ce612..0d986aace1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,9 +83,6 @@ jobs: dotnet: true - service_name: Attachments base_path: ./util - - service_name: Billing - base_path: ./src - dotnet: true - service_name: Events base_path: ./src dotnet: true @@ -183,7 +180,7 @@ jobs: echo "Restore" dotnet restore echo "Clean" - dotnet clean -c "Release" -o obj/Azure/publish + dotnet clean -c "Release" -o obj/build-output/publish - name: Execute Gulp if: ${{ matrix.gulp }} @@ -197,9 +194,9 @@ jobs: working-directory: ${{ matrix.base_path }}/${{ matrix.service_name }} run: | 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 . mv ${{ matrix.service_name }}.zip ../../../ @@ -285,12 +282,12 @@ jobs: echo "Restore" dotnet restore echo "Clean" - dotnet clean -c "Release" -o obj/Azure/publish + dotnet clean -c "Release" -o obj/build-output/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 \ - ./obj/Azure/publish/Api.dll public + ./obj/build-output/publish/Api.dll public cd ../.. env: ASPNETCORE_ENVIRONMENT: Production diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml index e369024b97..981a97e3d8 100644 --- a/.github/workflows/prod-deploy.yml +++ b/.github/workflows/prod-deploy.yml @@ -120,7 +120,7 @@ jobs: echo "Restore" dotnet restore $SERVICE_NAME.csproj 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 npm install @@ -129,9 +129,9 @@ jobs: fi 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 . mv $SERVICE_NAME.zip ../../../ env: diff --git a/.github/workflows/qa-deploy.yml b/.github/workflows/qa-deploy.yml index c4ca1f2c50..b8d01c1027 100644 --- a/.github/workflows/qa-deploy.yml +++ b/.github/workflows/qa-deploy.yml @@ -72,7 +72,7 @@ jobs: echo "Restore" dotnet restore $SERVICE_NAME.csproj 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 npm install @@ -81,9 +81,9 @@ jobs: fi 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 . mv $SERVICE_NAME.zip ../../../ env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7f6690275..1e6c5f8c1b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -183,12 +183,12 @@ jobs: echo "Restore" dotnet restore echo "Clean" - dotnet clean -c "Release" -o obj/Azure/publish + dotnet clean -c "Release" -o obj/build-output/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 \ - ./obj/Azure/publish/Api.dll public + ./obj/build-output/publish/Api.dll public cd ../.. env: ASPNETCORE_ENVIRONMENT: Production diff --git a/bitwarden_license/src/Portal/Dockerfile b/bitwarden_license/src/Portal/Dockerfile index e78ea95113..e361700faa 100644 --- a/bitwarden_license/src/Portal/Dockerfile +++ b/bitwarden_license/src/Portal/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update \ ENV ASPNETCORE_URLS http://+:5000 WORKDIR /app EXPOSE 5000 -COPY obj/Docker/publish . +COPY obj/build-output/publish . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh diff --git a/bitwarden_license/src/Portal/build.sh b/bitwarden_license/src/Portal/build.sh index fb0309c2d5..dc1b5f9ed5 100644 --- a/bitwarden_license/src/Portal/build.sh +++ b/bitwarden_license/src/Portal/build.sh @@ -11,14 +11,14 @@ echo ".NET Core version $(dotnet --version)" echo "Restore" dotnet restore "$DIR/Portal.csproj" 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" cd "$DIR" npm install cd "$CUR_DIR" gulp --gulpfile "$DIR/gulpfile.js" build 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" docker --version diff --git a/bitwarden_license/src/Sso/Dockerfile b/bitwarden_license/src/Sso/Dockerfile index e78ea95113..e361700faa 100644 --- a/bitwarden_license/src/Sso/Dockerfile +++ b/bitwarden_license/src/Sso/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update \ ENV ASPNETCORE_URLS http://+:5000 WORKDIR /app EXPOSE 5000 -COPY obj/Docker/publish . +COPY obj/build-output/publish . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh diff --git a/bitwarden_license/src/Sso/build.sh b/bitwarden_license/src/Sso/build.sh index 62d41aca7b..ff0288d277 100644 --- a/bitwarden_license/src/Sso/build.sh +++ b/bitwarden_license/src/Sso/build.sh @@ -11,14 +11,14 @@ echo ".NET Core version $(dotnet --version)" echo "Restore" dotnet restore "$DIR/Sso.csproj" 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" cd "$DIR" npm install cd "$CUR_DIR" gulp --gulpfile "$DIR/gulpfile.js" build 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" docker --version diff --git a/src/Admin/.dockerignore b/src/Admin/.dockerignore index 7e37ce5d99..fc12f25146 100644 --- a/src/Admin/.dockerignore +++ b/src/Admin/.dockerignore @@ -1,4 +1,4 @@ * -!obj/Docker/publish/* +!obj/build-output/publish/* !obj/Docker/empty/ !entrypoint.sh diff --git a/src/Admin/Dockerfile b/src/Admin/Dockerfile index d90ceb60bb..156091819a 100644 --- a/src/Admin/Dockerfile +++ b/src/Admin/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update \ ENV ASPNETCORE_URLS http://+:5000 WORKDIR /app EXPOSE 5000 -COPY obj/Docker/publish . +COPY obj/build-output/publish . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh diff --git a/src/Admin/build.sh b/src/Admin/build.sh index e7ec75c81b..bf2f198943 100755 --- a/src/Admin/build.sh +++ b/src/Admin/build.sh @@ -11,14 +11,14 @@ echo ".NET Core version $(dotnet --version)" echo "Restore" dotnet restore "$DIR/Admin.csproj" 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" cd "$DIR" npm install cd "$CUR_DIR" gulp --gulpfile "$DIR/gulpfile.js" build 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" docker --version diff --git a/src/Api/.dockerignore b/src/Api/.dockerignore index 7e37ce5d99..fc12f25146 100644 --- a/src/Api/.dockerignore +++ b/src/Api/.dockerignore @@ -1,4 +1,4 @@ * -!obj/Docker/publish/* +!obj/build-output/publish/* !obj/Docker/empty/ !entrypoint.sh diff --git a/src/Api/Dockerfile b/src/Api/Dockerfile index e3f4892159..e1ed8eaf52 100644 --- a/src/Api/Dockerfile +++ b/src/Api/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update \ ENV ASPNETCORE_URLS http://+:5000 WORKDIR /app EXPOSE 5000 -COPY obj/Docker/publish/Api . +COPY obj/build-output/publish/Api . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh diff --git a/src/Api/build.sh b/src/Api/build.sh index 87ab26a013..b74b52f3d5 100755 --- a/src/Api/build.sh +++ b/src/Api/build.sh @@ -10,9 +10,9 @@ echo ".NET Core version $(dotnet --version)" echo "Restore" dotnet restore "$DIR/Api.csproj" 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" -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" docker --version diff --git a/src/Events/.dockerignore b/src/Events/.dockerignore index 7e37ce5d99..fc12f25146 100644 --- a/src/Events/.dockerignore +++ b/src/Events/.dockerignore @@ -1,4 +1,4 @@ * -!obj/Docker/publish/* +!obj/build-output/publish/* !obj/Docker/empty/ !entrypoint.sh diff --git a/src/Events/Dockerfile b/src/Events/Dockerfile index 26e6f3211b..37f60b9a7e 100644 --- a/src/Events/Dockerfile +++ b/src/Events/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update \ ENV ASPNETCORE_URLS http://+:5000 WORKDIR /app EXPOSE 5000 -COPY obj/Docker/publish/Events . +COPY obj/build-output/publish/Events . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh diff --git a/src/Events/build.sh b/src/Events/build.sh index 73ca362b25..67168dd6d1 100755 --- a/src/Events/build.sh +++ b/src/Events/build.sh @@ -10,9 +10,9 @@ echo ".NET Core version $(dotnet --version)" echo "Restore" dotnet restore "$DIR/Events.csproj" 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" -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" docker --version diff --git a/src/EventsProcessor/Dockerfile b/src/EventsProcessor/Dockerfile index 4eaa6c155d..5027aa6179 100644 --- a/src/EventsProcessor/Dockerfile +++ b/src/EventsProcessor/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update \ ENV ASPNETCORE_URLS http://+:5000 WORKDIR /app EXPOSE 5000 -COPY obj/Docker/publish . +COPY obj/build-output/publish . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh diff --git a/src/EventsProcessor/build.sh b/src/EventsProcessor/build.sh index a684b6e028..ce4f146fa6 100755 --- a/src/EventsProcessor/build.sh +++ b/src/EventsProcessor/build.sh @@ -10,9 +10,9 @@ echo ".NET Core version $(dotnet --version)" echo "Restore" dotnet restore "$DIR/EventsProcessor.csproj" 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" -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" ] then diff --git a/src/Icons/.dockerignore b/src/Icons/.dockerignore index 7e37ce5d99..fc12f25146 100644 --- a/src/Icons/.dockerignore +++ b/src/Icons/.dockerignore @@ -1,4 +1,4 @@ * -!obj/Docker/publish/* +!obj/build-output/publish/* !obj/Docker/empty/ !entrypoint.sh diff --git a/src/Icons/Dockerfile b/src/Icons/Dockerfile index 6f9a6ff825..97d1eb764d 100644 --- a/src/Icons/Dockerfile +++ b/src/Icons/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update \ ENV ASPNETCORE_URLS http://+:5000 WORKDIR /app EXPOSE 5000 -COPY obj/Docker/publish . +COPY obj/build-output/publish . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh diff --git a/src/Icons/build.sh b/src/Icons/build.sh index 578ff60ffb..b42baea669 100755 --- a/src/Icons/build.sh +++ b/src/Icons/build.sh @@ -10,9 +10,9 @@ echo ".NET Core version $(dotnet --version)" echo "Restore" dotnet restore "$DIR/Icons.csproj" 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" -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" ] then diff --git a/src/Identity/.dockerignore b/src/Identity/.dockerignore index 7e37ce5d99..fc12f25146 100644 --- a/src/Identity/.dockerignore +++ b/src/Identity/.dockerignore @@ -1,4 +1,4 @@ * -!obj/Docker/publish/* +!obj/build-output/publish/* !obj/Docker/empty/ !entrypoint.sh diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile index 09bd5c962a..9ef1c0cc5d 100644 --- a/src/Identity/Dockerfile +++ b/src/Identity/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update \ ENV ASPNETCORE_URLS http://+:5000 WORKDIR /app EXPOSE 5000 -COPY obj/Docker/publish . +COPY obj/build-output/publish . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh diff --git a/src/Identity/build.sh b/src/Identity/build.sh index 1e24204689..df994dc708 100755 --- a/src/Identity/build.sh +++ b/src/Identity/build.sh @@ -10,9 +10,9 @@ echo ".NET Core version $(dotnet --version)" echo "Restore" dotnet restore "$DIR/Identity.csproj" 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" -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" docker --version diff --git a/src/Notifications/.dockerignore b/src/Notifications/.dockerignore index 7e37ce5d99..fc12f25146 100644 --- a/src/Notifications/.dockerignore +++ b/src/Notifications/.dockerignore @@ -1,4 +1,4 @@ * -!obj/Docker/publish/* +!obj/build-output/publish/* !obj/Docker/empty/ !entrypoint.sh diff --git a/src/Notifications/Dockerfile b/src/Notifications/Dockerfile index e78ea95113..e361700faa 100644 --- a/src/Notifications/Dockerfile +++ b/src/Notifications/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update \ ENV ASPNETCORE_URLS http://+:5000 WORKDIR /app EXPOSE 5000 -COPY obj/Docker/publish . +COPY obj/build-output/publish . COPY entrypoint.sh / RUN chmod +x /entrypoint.sh diff --git a/src/Notifications/build.sh b/src/Notifications/build.sh index 0ffc6cb925..6ef1154851 100755 --- a/src/Notifications/build.sh +++ b/src/Notifications/build.sh @@ -10,9 +10,9 @@ echo ".NET Core version $(dotnet --version)" echo "Restore" dotnet restore "$DIR/Notifications.csproj" 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" -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" ] then diff --git a/util/Server/.dockerignore b/util/Server/.dockerignore index d8f8175f6c..546b9afbef 100644 --- a/util/Server/.dockerignore +++ b/util/Server/.dockerignore @@ -1,3 +1,3 @@ * -!obj/Docker/publish/* +!obj/build-output/publish/* !obj/Docker/empty/ diff --git a/util/Server/Dockerfile b/util/Server/Dockerfile index 8715a88d14..69de097f43 100644 --- a/util/Server/Dockerfile +++ b/util/Server/Dockerfile @@ -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 diff --git a/util/Server/build.sh b/util/Server/build.sh index 6b82e8ee99..652403d108 100755 --- a/util/Server/build.sh +++ b/util/Server/build.sh @@ -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 diff --git a/util/Setup/.dockerignore b/util/Setup/.dockerignore index 7e37ce5d99..fc12f25146 100644 --- a/util/Setup/.dockerignore +++ b/util/Setup/.dockerignore @@ -1,4 +1,4 @@ * -!obj/Docker/publish/* +!obj/build-output/publish/* !obj/Docker/empty/ !entrypoint.sh diff --git a/util/Setup/Dockerfile b/util/Setup/Dockerfile index b4264d7287..f63e4ed8cc 100644 --- a/util/Setup/Dockerfile +++ b/util/Setup/Dockerfile @@ -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 diff --git a/util/Setup/build.sh b/util/Setup/build.sh index c6292b19b7..7696713be5 100755 --- a/util/Setup/build.sh +++ b/util/Setup/build.sh @@ -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