nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-16 02:28:13 -05:00
Code

Fix Dockerfiles

Browse Source
This commit is contained in:
Vince Grassia 2023-11-15 16:05:05 -05:00
parent bd13dd64ac
commit 9381577f66
No known key found for this signature in database
GPG Key ID: 9AD7505E8448CC08
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Admin/Dockerfile
View File

@ -47,6 +47,7 @@ COPY util/Migrator/. ./util/Migrator/
COPY util/MySqlMigrations/. ./util/MySqlMigrations/ COPY util/MySqlMigrations/. ./util/MySqlMigrations/
COPY util/PostgresMigrations/. ./util/PostgresMigrations/ COPY util/PostgresMigrations/. ./util/PostgresMigrations/
COPY util/SqliteMigrations/. ./util/SqliteMigrations/ 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.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 .git/. ./.git/

2
src/Events/Dockerfile
View File

@ -64,7 +64,7 @@ RUN apt-get update \
# Copy app from the build stage # Copy app from the build stage
WORKDIR /app WORKDIR /app
COPY --from=build /app/Admin ./ COPY --from=build /app/Events ./
COPY src/Events/entrypoint.sh / COPY src/Events/entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh

1
src/Identity/Dockerfile
View File

@ -47,6 +47,7 @@ COPY util/Migrator/. ./util/Migrator/
COPY util/MySqlMigrations/. ./util/MySqlMigrations/ COPY util/MySqlMigrations/. ./util/MySqlMigrations/
COPY util/PostgresMigrations/. ./util/PostgresMigrations/ COPY util/PostgresMigrations/. ./util/PostgresMigrations/
COPY util/SqliteMigrations/. ./util/SqliteMigrations/ 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.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 .git/. ./.git/

6
util/MsSql/Dockerfile
View File

@ -10,9 +10,9 @@ RUN apt-get update \
tzdata \ tzdata \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY backup-db.sql / COPY util/MsSql/backup-db.sql /
COPY backup-db.sh / COPY util/MsSql/backup-db.sh /
COPY entrypoint.sh / COPY util/MsSql/entrypoint.sh /
RUN chmod +x /entrypoint.sh \ RUN chmod +x /entrypoint.sh \
&& chmod +x /backup-db.sh && chmod +x /backup-db.sh

4
util/MsSqlMigratorUtility/Dockerfile
View File

@ -6,7 +6,7 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS bitwarden-build
# Copy csproj files as distinct layers # Copy csproj files as distinct layers
WORKDIR /source WORKDIR /source
COPY *.csproj ./util/MsSqlMigratorUtility/ COPY util/MsSqlMigratorUtility/*.csproj ./util/MsSqlMigratorUtility/
# Restore MsSqlMigratorUtility project dependencies and tools # Restore MsSqlMigratorUtility project dependencies and tools
WORKDIR /source/util/MsSqlMigratorUtility WORKDIR /source/util/MsSqlMigratorUtility
@ -14,7 +14,7 @@ RUN dotnet restore
# Copy required project files # Copy required project files
WORKDIR /source WORKDIR /source
COPY . ./util/MsSqlMigratorUtility/ COPY util/MsSqlMigratorUtility/. ./util/MsSqlMigratorUtility/
# Build Setup app # Build Setup app
WORKDIR /source/util/MsSqlMigratorUtility WORKDIR /source/util/MsSqlMigratorUtility

14
util/Nginx/Dockerfile
View File

@ -9,13 +9,13 @@ RUN apt-get update \
curl \ curl \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY nginx.conf /etc/nginx COPY util/Nginx/nginx.conf /etc/nginx
COPY proxy.conf /etc/nginx COPY util/Nginx/proxy.conf /etc/nginx
COPY mime.types /etc/nginx COPY util/Nginx/mime.types /etc/nginx
COPY security-headers.conf /etc/nginx COPY util/Nginx/security-headers.conf /etc/nginx
COPY security-headers-ssl.conf /etc/nginx COPY util/Nginx/security-headers-ssl.conf /etc/nginx
COPY logrotate.sh / COPY util/Nginx/logrotate.sh /
COPY entrypoint.sh / COPY util/Nginx/entrypoint.sh /
EXPOSE 8080 EXPOSE 8080
EXPOSE 8443 EXPOSE 8443

1
util/Setup/Dockerfile
View File

@ -29,6 +29,7 @@ RUN . /tmp/rid.txt && dotnet restore -r $RID
# Copy required project files # Copy required project files
WORKDIR /source WORKDIR /source
COPY util/Migrator/. ./util/Migrator/
COPY util/Setup/. ./util/Setup/ COPY util/Setup/. ./util/Setup/
COPY .git/. ./.git/ COPY .git/. ./.git/