From 9381577f6647481a594ca36e2055b5e513f09ae8 Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Wed, 15 Nov 2023 16:05:05 -0500
Subject: [PATCH] Fix Dockerfiles

---
 src/Admin/Dockerfile                 |  1 +
 src/Events/Dockerfile                |  2 +-
 src/Identity/Dockerfile              |  1 +
 util/MsSql/Dockerfile                |  6 +++---
 util/MsSqlMigratorUtility/Dockerfile |  4 ++--
 util/Nginx/Dockerfile                | 14 +++++++-------
 util/Setup/Dockerfile                |  1 +
 7 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/Admin/Dockerfile b/src/Admin/Dockerfile
index 644f10f0ce..37e523a4fe 100644
--- a/src/Admin/Dockerfile
+++ b/src/Admin/Dockerfile
@@ -47,6 +47,7 @@ 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/
diff --git a/src/Events/Dockerfile b/src/Events/Dockerfile
index 0cdc099f2c..2833c860f9 100644
--- a/src/Events/Dockerfile
+++ b/src/Events/Dockerfile
@@ -64,7 +64,7 @@ RUN apt-get update \
 
 # Copy app from the build stage
 WORKDIR /app
-COPY --from=build /app/Admin ./
+COPY --from=build /app/Events ./
 COPY src/Events/entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile
index dec0b6d0a0..3e9fb769aa 100644
--- a/src/Identity/Dockerfile
+++ b/src/Identity/Dockerfile
@@ -47,6 +47,7 @@ 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/
diff --git a/util/MsSql/Dockerfile b/util/MsSql/Dockerfile
index 330f78208f..572a2b8007 100644
--- a/util/MsSql/Dockerfile
+++ b/util/MsSql/Dockerfile
@@ -10,9 +10,9 @@ RUN apt-get update \
         tzdata \
     && rm -rf /var/lib/apt/lists/*
 
-COPY backup-db.sql /
-COPY backup-db.sh /
-COPY entrypoint.sh /
+COPY util/MsSql/backup-db.sql /
+COPY util/MsSql/backup-db.sh /
+COPY util/MsSql/entrypoint.sh /
 
 RUN chmod +x /entrypoint.sh \
     && chmod +x /backup-db.sh
diff --git a/util/MsSqlMigratorUtility/Dockerfile b/util/MsSqlMigratorUtility/Dockerfile
index 133beb6fe7..815a53011d 100644
--- a/util/MsSqlMigratorUtility/Dockerfile
+++ b/util/MsSqlMigratorUtility/Dockerfile
@@ -6,7 +6,7 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS bitwarden-build
 
 # Copy csproj files as distinct layers
 WORKDIR /source
-COPY *.csproj ./util/MsSqlMigratorUtility/
+COPY util/MsSqlMigratorUtility/*.csproj ./util/MsSqlMigratorUtility/
 
 # Restore MsSqlMigratorUtility project dependencies and tools
 WORKDIR /source/util/MsSqlMigratorUtility
@@ -14,7 +14,7 @@ RUN dotnet restore
 
 # Copy required project files
 WORKDIR /source
-COPY . ./util/MsSqlMigratorUtility/
+COPY util/MsSqlMigratorUtility/. ./util/MsSqlMigratorUtility/
 
 # Build Setup app
 WORKDIR /source/util/MsSqlMigratorUtility
diff --git a/util/Nginx/Dockerfile b/util/Nginx/Dockerfile
index 973b616efb..7f85b77ea6 100644
--- a/util/Nginx/Dockerfile
+++ b/util/Nginx/Dockerfile
@@ -9,13 +9,13 @@ RUN apt-get update \
         curl \
     && rm -rf /var/lib/apt/lists/*
 
-COPY nginx.conf /etc/nginx
-COPY proxy.conf /etc/nginx
-COPY mime.types /etc/nginx
-COPY security-headers.conf /etc/nginx
-COPY security-headers-ssl.conf /etc/nginx
-COPY logrotate.sh /
-COPY entrypoint.sh /
+COPY util/Nginx/nginx.conf /etc/nginx
+COPY util/Nginx/proxy.conf /etc/nginx
+COPY util/Nginx/mime.types /etc/nginx
+COPY util/Nginx/security-headers.conf /etc/nginx
+COPY util/Nginx/security-headers-ssl.conf /etc/nginx
+COPY util/Nginx/logrotate.sh /
+COPY util/Nginx/entrypoint.sh /
 
 EXPOSE 8080
 EXPOSE 8443
diff --git a/util/Setup/Dockerfile b/util/Setup/Dockerfile
index 2c5a85eea0..34570ecae8 100644
--- a/util/Setup/Dockerfile
+++ b/util/Setup/Dockerfile
@@ -29,6 +29,7 @@ RUN . /tmp/rid.txt && dotnet restore -r $RID
 
 # Copy required project files
 WORKDIR /source
+COPY util/Migrator/. ./util/Migrator/
 COPY util/Setup/. ./util/Setup/
 COPY .git/. ./.git/