build: optimize for simpler builds over caching

2025-05-22 12:04:27 -05:00 · 2025-05-19 10:52:07 -07:00 · 2025-05-19 10:52:07 -07:00 · 30369d9a8a
commit 30369d9a8a
parent a246d54122
12 changed files with 48 additions and 235 deletions
--- a/bitwarden_license/src/Scim/Dockerfile
+++ b/bitwarden_license/src/Scim/Dockerfile
@ -17,34 +17,15 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

+# Copy required project files
 WORKDIR /source
-
-# Copy csproj files as distinct layers
-COPY bitwarden_license/src/Scim/*.csproj ./bitwarden_license/src/Scim/
-COPY src/Core/*.csproj ./src/Core/
-COPY src/Infrastructure.Dapper/*.csproj ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/*.csproj ./src/SharedWeb/
-COPY Directory.Build.props .
+COPY . ./

 # Restore project dependencies and tools
 WORKDIR /source/bitwarden_license/src/Scim
 RUN . /tmp/rid.txt && dotnet restore -r $RID

-WORKDIR /source/bitwarden_license/src/Scim
-
-# Copy required project files
-WORKDIR /source
-COPY .editorconfig /source
-COPY bitwarden_license/src/Scim/. ./bitwarden_license/src/Scim/
-COPY src/Core/. ./src/Core/
-COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/. ./src/SharedWeb/
-COPY .git/. ./.git/
-
 # Build project
-WORKDIR /source/bitwarden_license/src/Scim
 RUN . /tmp/rid.txt && dotnet publish \
  -c release \
  --no-restore \
--- a/bitwarden_license/src/Sso/Dockerfile
+++ b/bitwarden_license/src/Sso/Dockerfile
@ -17,34 +17,15 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

+# Copy required project files
 WORKDIR /source
-
-# Copy csproj files as distinct layers
-COPY bitwarden_license/src/Sso/*.csproj ./bitwarden_license/src/Sso/
-COPY src/Core/*.csproj ./src/Core/
-COPY src/Infrastructure.Dapper/*.csproj ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/*.csproj ./src/SharedWeb/
-COPY Directory.Build.props .
+COPY . ./

 # Restore project dependencies and tools
 WORKDIR /source/bitwarden_license/src/Sso
 RUN . /tmp/rid.txt && dotnet restore -r $RID

-WORKDIR /source/bitwarden_license/src/Sso
-
-# Copy required project files
-WORKDIR /source
-COPY .editorconfig /source
-COPY bitwarden_license/src/Sso/. ./bitwarden_license/src/Sso/
-COPY src/Core/. ./src/Core/
-COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/. ./src/SharedWeb/
-COPY .git/. ./.git/
-
 # Build project
-WORKDIR /source/bitwarden_license/src/Sso
 RUN . /tmp/rid.txt && dotnet publish \
    -c release \
    --no-restore \
--- a/src/Admin/Dockerfile
+++ b/src/Admin/Dockerfile
@ -17,21 +17,6 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

-# Copy csproj files as distinct layers
-WORKDIR /source
-COPY src/Admin/*.csproj ./src/Admin/
-COPY src/Core/*.csproj ./src/Core/
-COPY src/Infrastructure.Dapper/*.csproj ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/*.csproj ./src/SharedWeb/
-COPY util/Migrator/*.csproj ./util/Migrator/
-COPY util/MySqlMigrations/*.csproj ./util/MySqlMigrations/
-COPY util/PostgresMigrations/*.csproj ./util/PostgresMigrations/
-COPY util/SqliteMigrations/*.csproj ./util/SqliteMigrations/
-COPY bitwarden_license/src/Commercial.Core/*.csproj ./bitwarden_license/src/Commercial.Core/
-COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/*.csproj ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
-COPY Directory.Build.props .
-
 # Set up Node
 ARG NODE_VERSION=20
 RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - \
@ -40,33 +25,16 @@ RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - \
    && npm install -g npm@latest && \
    rm -rf /var/lib/apt/lists/*

-# Copying package.json, package-lock.json, and packages.lock.json
-WORKDIR /source/src/Admin
-COPY src/Admin/package*.json .
-RUN npm ci
-
-# Restore project dependencies and tools
-RUN . /tmp/rid.txt && dotnet restore -r $RID
-
 # Copy required project files
 WORKDIR /source
-COPY src/Admin/. ./src/Admin/
-COPY src/Core/. ./src/Core/
-COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/. ./src/SharedWeb/
-COPY util/Migrator/. ./util/Migrator/
-COPY util/MySqlMigrations/. ./util/MySqlMigrations/
-COPY util/PostgresMigrations/. ./util/PostgresMigrations/
-COPY util/SqliteMigrations/. ./util/SqliteMigrations/
-COPY util/EfShared/. ./util/EfShared/
-COPY bitwarden_license/src/Commercial.Core/. ./bitwarden_license/src/Commercial.Core/
-COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/. ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
-COPY .git/. ./.git/
-COPY .editorconfig /source
+COPY . ./
+
+# Restore project dependencies and tools
+WORKDIR /source/src/Admin
+RUN npm ci
+RUN . /tmp/rid.txt && dotnet restore -r $RID

 # Build project
-WORKDIR /source/src/Admin
 RUN npm run build
 RUN . /tmp/rid.txt && dotnet publish \
    --self-contained \
@ -79,11 +47,13 @@ RUN . /tmp/rid.txt && dotnet publish \
 #                  App stage                  #
 ###############################################
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
-LABEL com.bitwarden.product="bitwarden"
-EXPOSE 5000

+ARG TARGETPLATFORM
+LABEL com.bitwarden.product="bitwarden"
+ENV ASPNETCORE_ENVIRONMENT=Production
 ENV ASPNETCORE_URLS=http://+:5000
 ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates
+EXPOSE 5000

 RUN apt-get update \
    && apt-get install -y --no-install-recommends \
--- a/src/Api/Dockerfile
+++ b/src/Api/Dockerfile
@ -18,36 +18,18 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

-# Copy csproj files as distinct layers
+# Copy required project files
 WORKDIR /source
-COPY src/Api/*.csproj ./src/Api/
-COPY src/Core/*.csproj ./src/Core/
-COPY src/Infrastructure.Dapper/*.csproj ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/*.csproj ./src/SharedWeb/
-COPY bitwarden_license/src/Commercial.Core/*.csproj ./bitwarden_license/src/Commercial.Core/
-COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/*.csproj ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
-COPY Directory.Build.props .
+COPY . ./

 # Restore project dependencies and tools
 WORKDIR /source/src/Api
 RUN . /tmp/rid.txt && dotnet restore -r $RID

-# Copy required project files
-WORKDIR /source
-COPY src/Api/. ./src/Api/
-COPY src/Core/. ./src/Core/
-COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/. ./src/SharedWeb/
-COPY bitwarden_license/src/Commercial.Core/. ./bitwarden_license/src/Commercial.Core/
-COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/. ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
-COPY .git/. ./.git/
-COPY .editorconfig /source
-
 # Build project
-WORKDIR /source/src/Api
 RUN . /tmp/rid.txt && dotnet publish \
+    -c release \
+    --no-restore \
    --self-contained \
    /p:PublishSingleFile=true \
    /p:SourceRevisionId="$GIT_COMMIT" \
--- a/src/Billing/Dockerfile
+++ b/src/Billing/Dockerfile
@ -18,32 +18,18 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

-# Copy csproj files as distinct layers
+# Copy required project files
 WORKDIR /source
-COPY src/Billing/*.csproj ./src/Billing/
-COPY src/Core/*.csproj ./src/Core/
-COPY src/Infrastructure.Dapper/*.csproj ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/*.csproj ./src/SharedWeb/
-COPY Directory.Build.props .
+COPY . ./

 # Restore project dependencies and tools
 WORKDIR /source/src/Billing
 RUN . /tmp/rid.txt && dotnet restore -r $RID

-# Copy required project files
-WORKDIR /source
-COPY src/Billing/. ./src/Billing/
-COPY src/Core/. ./src/Core/
-COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/. ./src/SharedWeb/
-COPY .git/. ./.git/
-COPY .editorconfig .
-
 # Build project
-WORKDIR /source/src/Billing
 RUN . /tmp/rid.txt && dotnet publish \
+    -c release \
+    --no-restore \
    --self-contained \
    /p:PublishSingleFile=true \
    /p:SourceRevisionId="$GIT_COMMIT" \
--- a/src/Events/Dockerfile
+++ b/src/Events/Dockerfile
@ -18,32 +18,18 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

-# Copy csproj files as distinct layers
+# Copy required project files
 WORKDIR /source
-COPY src/Events/*.csproj ./src/Events/
-COPY src/Core/*.csproj ./src/Core/
-COPY src/Infrastructure.Dapper/*.csproj ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/*.csproj ./src/SharedWeb/
-COPY Directory.Build.props .
+COPY . ./

 # Restore project dependencies and tools
 WORKDIR /source/src/Events
 RUN . /tmp/rid.txt && dotnet restore -r $RID

-# Copy required project files
-WORKDIR /source
-COPY src/Events/. ./src/Events/
-COPY src/Core/. ./src/Core/
-COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/. ./src/SharedWeb/
-COPY .git/. ./.git/
-COPY .editorconfig /source
-
 # Build project
-WORKDIR /source/src/Events
 RUN . /tmp/rid.txt && dotnet publish \
+    -c release \
+    --no-restore \
    --self-contained \
    /p:PublishSingleFile=true \
    /p:SourceRevisionId="$GIT_COMMIT" \
--- a/src/EventsProcessor/Dockerfile
+++ b/src/EventsProcessor/Dockerfile
@ -18,33 +18,18 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

-# Copy csproj files as distinct layers
+# Copy required project files
 WORKDIR /source
-
-COPY src/EventsProcessor/*.csproj ./src/EventsProcessor/
-COPY src/Core/*.csproj ./src/Core/
-COPY src/Infrastructure.Dapper/*.csproj ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/*.csproj ./src/SharedWeb/
-COPY Directory.Build.props .
+COPY . ./

 # Restore project dependencies and tools
 WORKDIR /source/src/EventsProcessor
 RUN . /tmp/rid.txt && dotnet restore -r $RID

-# Copy required project files
-WORKDIR /source
-COPY src/EventsProcessor/. ./src/EventsProcessor/
-COPY src/Core/. ./src/Core/
-COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/. ./src/SharedWeb/
-COPY .git/. ./.git/
-COPY .editorconfig /source
-
 # Build project
-WORKDIR /source/src/EventsProcessor
 RUN . /tmp/rid.txt && dotnet publish \
+    -c release \
+    --no-restore \
    --self-contained \
    /p:PublishSingleFile=true \
    /p:SourceRevisionId="$GIT_COMMIT" \
@ -71,7 +56,6 @@ RUN apt-get update \
    curl \
    && rm -rf /var/lib/apt/lists/*

-# Copy app from the build stage
 # Copy app from the build stage
 WORKDIR /app
 COPY --from=build /source/src/EventsProcessor/out /app
--- a/src/Icons/Dockerfile
+++ b/src/Icons/Dockerfile
@ -17,32 +17,18 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

-# Copy csproj files as distinct layers
+# Copy required project files
 WORKDIR /source
-COPY src/Icons/*.csproj ./src/Icons/
-COPY src/Core/*.csproj ./src/Core/
-COPY src/Infrastructure.Dapper/*.csproj ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/*.csproj ./src/SharedWeb/
-COPY Directory.Build.props .
+COPY . ./

 # Restore project dependencies and tools
 WORKDIR /source/src/Icons
 RUN . /tmp/rid.txt && dotnet restore -r $RID

-# Copy required project files
-WORKDIR /source
-COPY src/Icons/. ./src/Icons/
-COPY src/Core/. ./src/Core/
-COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/. ./src/SharedWeb/
-COPY .git/. ./.git/
-COPY .editorconfig /source
-
 # Build project
-WORKDIR /source/src/Icons
 RUN . /tmp/rid.txt && dotnet publish \
+    -c release \
+    --no-restore \
    --self-contained \
    /p:PublishSingleFile=true \
    /p:SourceRevisionId="$GIT_COMMIT" \
--- a/src/Identity/Dockerfile
+++ b/src/Identity/Dockerfile
@ -18,32 +18,18 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

-# Copy csproj files as distinct layers
+# Copy required project files
 WORKDIR /source
-COPY src/Identity/*.csproj ./src/Identity/
-COPY src/Core/*.csproj ./src/Core/
-COPY src/Infrastructure.Dapper/*.csproj ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/*.csproj ./src/SharedWeb/
-COPY Directory.Build.props .
+COPY . ./

 # Restore project dependencies and tools
 WORKDIR /source/src/Identity
 RUN . /tmp/rid.txt && dotnet restore -r $RID

-# Copy required project files
-WORKDIR /source
-COPY src/Identity/. ./src/Identity/
-COPY src/Core/. ./src/Core/
-COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/. ./src/SharedWeb/
-COPY .git/. ./.git/
-COPY .editorconfig /source
-
 # Build project
-WORKDIR /source/src/Identity
 RUN . /tmp/rid.txt && dotnet publish \
+    -c release \
+    --no-restore \
    --self-contained \
    /p:PublishSingleFile=true \
    /p:SourceRevisionId="$GIT_COMMIT" \
@ -76,7 +62,6 @@ WORKDIR /app
 COPY --from=build /source/src/Identity/out /app
 COPY ./src/Identity/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
-
 HEALTHCHECK CMD curl -f http://localhost:5000/.well-known/openid-configuration || exit 1

 ENTRYPOINT ["/entrypoint.sh"]
--- a/src/Notifications/Dockerfile
+++ b/src/Notifications/Dockerfile
@ -18,32 +18,18 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

-# Copy csproj files as distinct layers
+# Copy required project files
 WORKDIR /source
-COPY src/Notifications/*.csproj ./src/Notifications/
-COPY src/Core/*.csproj ./src/Core/
-COPY src/Infrastructure.Dapper/*.csproj ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/*.csproj ./src/SharedWeb/
-COPY Directory.Build.props .
+COPY . ./

 # Restore project dependencies and tools
 WORKDIR /source/src/Notifications
 RUN . /tmp/rid.txt && dotnet restore -r $RID

-# Copy required project files
-WORKDIR /source
-COPY src/Notifications/. ./src/Notifications/
-COPY src/Core/. ./src/Core/
-COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
-COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
-COPY src/SharedWeb/. ./src/SharedWeb/
-COPY .git/. ./.git/
-COPY .editorconfig /source
-
 # Build project
-WORKDIR /source/src/Notifications
 RUN . /tmp/rid.txt && dotnet publish \
+    -c release \
+    --no-restore \
    --self-contained \
    /p:PublishSingleFile=true \
    /p:SourceRevisionId="$GIT_COMMIT" \
--- a/util/Attachments/Dockerfile
+++ b/util/Attachments/Dockerfile
@ -17,20 +17,14 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

-# Copy csproj files as distinct layers
+# Copy required project files
 WORKDIR /source
-COPY util/Server/*.csproj ./util/Server/
-COPY Directory.Build.props .
-COPY .editorconfig .
+COPY . ./

 # Restore project dependencies and tools
 WORKDIR /source/util/Server
 RUN . /tmp/rid.txt && dotnet restore -r $RID

-# Copy required project files
-WORKDIR /source
-COPY util/Server/. ./util/Server/
-
 # Build project
 WORKDIR /source/util/Server
 RUN . /tmp/rid.txt && dotnet publish \
--- a/util/Setup/Dockerfile
+++ b/util/Setup/Dockerfile
@ -18,27 +18,19 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
    fi \
    && echo "RID=$RID" > /tmp/rid.txt

-# Copy csproj files as distinct layers
+# Copy required project files
 WORKDIR /source
-COPY util/Setup/*.csproj ./util/Setup/
-COPY src/Core/*.csproj ./src/Core/
-COPY util/Migrator/*.csproj ./util/Migrator/
-COPY Directory.Build.props .
+COPY . ./

 # Restore project dependencies and tools
 WORKDIR /source/util/Setup
 RUN . /tmp/rid.txt && dotnet restore -r $RID

-# Copy required project files
-WORKDIR /source
-COPY util/Setup/. ./util/Setup/
-COPY src/Core/. ./src/Core/
-COPY util/Migrator/. ./util/Migrator/
-COPY .editorconfig /source
-
 # Build project
 WORKDIR /source/util/Setup
 RUN . /tmp/rid.txt && dotnet publish \
+    -c release \
+    --no-restore \
    --self-contained \
    /p:SourceRevisionId="$GIT_COMMIT" \
    -r $RID \