1
0
mirror of https://github.com/bitwarden/server.git synced 2025-05-02 10:12:16 -05:00

Revert "build: we don't need to copy the .git dir"

This reverts commit 32c2f6236a894534de09ffe847ffff064a7174bd.
This commit is contained in:
tangowithfoxtrot 2025-04-30 13:35:38 -07:00
parent 32c2f6236a
commit 7a99f5dc5d
No known key found for this signature in database
11 changed files with 18 additions and 3 deletions

View File

@ -9,11 +9,11 @@ ARG TARGETPLATFORM
# Determine proper runtime value for .NET # Determine proper runtime value for .NET
# We put the value in a file to be read by later layers. # We put the value in a file to be read by later layers.
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
RID=linux-x64 ; \ RID=linux-x64 ; \
elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
RID=linux-arm64 ; \ RID=linux-arm64 ; \
elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \ elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
RID=linux-arm ; \ RID=linux-arm ; \
fi \ fi \
&& echo "RID=$RID" > /tmp/rid.txt && echo "RID=$RID" > /tmp/rid.txt
@ -31,6 +31,8 @@ COPY Directory.Build.props .
WORKDIR /source/bitwarden_license/src/Scim WORKDIR /source/bitwarden_license/src/Scim
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
WORKDIR /source/bitwarden_license/src/Scim
# Copy required project files # Copy required project files
WORKDIR /source WORKDIR /source
COPY .editorconfig /source COPY .editorconfig /source
@ -39,6 +41,7 @@ COPY src/Core/. ./src/Core/
COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/ COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/
# Build project # Build project
WORKDIR /source/bitwarden_license/src/Scim WORKDIR /source/bitwarden_license/src/Scim

View File

@ -31,6 +31,8 @@ COPY Directory.Build.props .
WORKDIR /source/bitwarden_license/src/Sso WORKDIR /source/bitwarden_license/src/Sso
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
WORKDIR /source/bitwarden_license/src/Sso
# Copy required project files # Copy required project files
WORKDIR /source WORKDIR /source
COPY .editorconfig /source COPY .editorconfig /source
@ -39,6 +41,7 @@ COPY src/Core/. ./src/Core/
COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/ COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/
# Build project # Build project
WORKDIR /source/bitwarden_license/src/Sso WORKDIR /source/bitwarden_license/src/Sso

View File

@ -62,6 +62,7 @@ COPY util/SqliteMigrations/. ./util/SqliteMigrations/
COPY util/EfShared/. ./util/EfShared/ COPY util/EfShared/. ./util/EfShared/
COPY bitwarden_license/src/Commercial.Core/. ./bitwarden_license/src/Commercial.Core/ 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 bitwarden_license/src/Commercial.Infrastructure.EntityFramework/. ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
COPY .git/. ./.git/
COPY .editorconfig /source COPY .editorconfig /source
# Build project # Build project

View File

@ -42,6 +42,7 @@ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY bitwarden_license/src/Commercial.Core/. ./bitwarden_license/src/Commercial.Core/ 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 bitwarden_license/src/Commercial.Infrastructure.EntityFramework/. ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
COPY .git/. ./.git/
COPY .editorconfig /source COPY .editorconfig /source
# Build project # Build project

View File

@ -38,6 +38,7 @@ COPY src/Core/. ./src/Core/
COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/ COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/
COPY .editorconfig . COPY .editorconfig .
# Build project # Build project

View File

@ -38,6 +38,7 @@ COPY src/Core/. ./src/Core/
COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/ COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/
COPY .editorconfig /source COPY .editorconfig /source
# Build project # Build project

View File

@ -39,6 +39,7 @@ COPY src/Core/. ./src/Core/
COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/ COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/
COPY .editorconfig /source COPY .editorconfig /source
# Build project # Build project

View File

@ -37,6 +37,7 @@ COPY src/Core/. ./src/Core/
COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/ COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/
COPY .editorconfig /source COPY .editorconfig /source
# Build project # Build project

View File

@ -38,6 +38,7 @@ COPY src/Core/. ./src/Core/
COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/ COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/
COPY .editorconfig /source COPY .editorconfig /source
# Build project # Build project

View File

@ -38,6 +38,7 @@ COPY src/Core/. ./src/Core/
COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/ COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/
COPY .editorconfig /source COPY .editorconfig /source
# Build project # Build project

View File

@ -38,6 +38,7 @@ COPY util/MsSqlMigratorUtility/. ./util/MsSqlMigratorUtility/
COPY src/Core/. ./src/Core/ COPY src/Core/. ./src/Core/
COPY util/Migrator/. ./util/Migrator/ COPY util/Migrator/. ./util/Migrator/
COPY util/Server/. ./util/Server/ COPY util/Server/. ./util/Server/
COPY .git/. ./.git/
COPY .editorconfig /source COPY .editorconfig /source
# Build project # Build project