From 1e570b6fb7b9e9bbe4186cec6c377ae4c2dd4d57 Mon Sep 17 00:00:00 2001 From: Slendy Date: Sat, 20 Jan 2024 16:15:01 -0600 Subject: [PATCH 1/2] Move StaticFiles to the Website project --- .../StaticFiles/android-chrome-192x192.png | Bin .../StaticFiles/android-chrome-512x512.png | Bin .../StaticFiles/apple-touch-icon.png | Bin .../StaticFiles/assets/advSlotCardMask.png | Bin .../StaticFiles/assets/advSlotCardOverlay.png | Bin .../StaticFiles/assets/slotCardBackground.png | Bin .../StaticFiles/assets/slotCardOverlay.png | Bin .../StaticFiles/browserconfig.xml | 0 .../StaticFiles/css/semantic.min.css | 0 .../StaticFiles/css/styles.css | 0 .../css/themes/default/assets/fonts/brand-icons.eot | Bin .../css/themes/default/assets/fonts/brand-icons.svg | 0 .../css/themes/default/assets/fonts/brand-icons.ttf | Bin .../themes/default/assets/fonts/brand-icons.woff | Bin .../themes/default/assets/fonts/brand-icons.woff2 | Bin .../css/themes/default/assets/fonts/icons.eot | Bin .../css/themes/default/assets/fonts/icons.svg | 0 .../css/themes/default/assets/fonts/icons.ttf | Bin .../css/themes/default/assets/fonts/icons.woff | Bin .../css/themes/default/assets/fonts/icons.woff2 | Bin .../themes/default/assets/fonts/outline-icons.eot | Bin .../themes/default/assets/fonts/outline-icons.svg | 0 .../themes/default/assets/fonts/outline-icons.ttf | Bin .../themes/default/assets/fonts/outline-icons.woff | Bin .../themes/default/assets/fonts/outline-icons.woff2 | Bin .../css/themes/default/assets/images/flags.png | Bin .../StaticFiles/favicon-16x16.png | Bin .../StaticFiles/favicon-32x32.png | Bin .../StaticFiles/favicon.ico | Bin .../StaticFiles/logo-color.png | Bin .../StaticFiles/logo-mono.png | Bin .../StaticFiles/logo-pride.png | Bin .../StaticFiles/logo.svg | 0 .../StaticFiles/mstile-150x150.png | Bin .../StaticFiles/safari-pinned-tab.svg | 0 .../StaticFiles/site.webmanifest | 0 36 files changed, 0 insertions(+), 0 deletions(-) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/android-chrome-192x192.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/android-chrome-512x512.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/apple-touch-icon.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/assets/advSlotCardMask.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/assets/advSlotCardOverlay.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/assets/slotCardBackground.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/assets/slotCardOverlay.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/browserconfig.xml (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/semantic.min.css (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/styles.css (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/brand-icons.eot (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/brand-icons.svg (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/brand-icons.ttf (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/brand-icons.woff (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/brand-icons.woff2 (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/icons.eot (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/icons.svg (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/icons.ttf (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/icons.woff (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/icons.woff2 (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/outline-icons.eot (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/outline-icons.svg (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/outline-icons.ttf (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/outline-icons.woff (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/fonts/outline-icons.woff2 (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/css/themes/default/assets/images/flags.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/favicon-16x16.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/favicon-32x32.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/favicon.ico (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/logo-color.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/logo-mono.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/logo-pride.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/logo.svg (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/mstile-150x150.png (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/safari-pinned-tab.svg (100%) rename {ProjectLighthouse => ProjectLighthouse.Servers.Website}/StaticFiles/site.webmanifest (100%) diff --git a/ProjectLighthouse/StaticFiles/android-chrome-192x192.png b/ProjectLighthouse.Servers.Website/StaticFiles/android-chrome-192x192.png similarity index 100% rename from ProjectLighthouse/StaticFiles/android-chrome-192x192.png rename to ProjectLighthouse.Servers.Website/StaticFiles/android-chrome-192x192.png diff --git a/ProjectLighthouse/StaticFiles/android-chrome-512x512.png b/ProjectLighthouse.Servers.Website/StaticFiles/android-chrome-512x512.png similarity index 100% rename from ProjectLighthouse/StaticFiles/android-chrome-512x512.png rename to ProjectLighthouse.Servers.Website/StaticFiles/android-chrome-512x512.png diff --git a/ProjectLighthouse/StaticFiles/apple-touch-icon.png b/ProjectLighthouse.Servers.Website/StaticFiles/apple-touch-icon.png similarity index 100% rename from ProjectLighthouse/StaticFiles/apple-touch-icon.png rename to ProjectLighthouse.Servers.Website/StaticFiles/apple-touch-icon.png diff --git a/ProjectLighthouse/StaticFiles/assets/advSlotCardMask.png b/ProjectLighthouse.Servers.Website/StaticFiles/assets/advSlotCardMask.png similarity index 100% rename from ProjectLighthouse/StaticFiles/assets/advSlotCardMask.png rename to ProjectLighthouse.Servers.Website/StaticFiles/assets/advSlotCardMask.png diff --git a/ProjectLighthouse/StaticFiles/assets/advSlotCardOverlay.png b/ProjectLighthouse.Servers.Website/StaticFiles/assets/advSlotCardOverlay.png similarity index 100% rename from ProjectLighthouse/StaticFiles/assets/advSlotCardOverlay.png rename to ProjectLighthouse.Servers.Website/StaticFiles/assets/advSlotCardOverlay.png diff --git a/ProjectLighthouse/StaticFiles/assets/slotCardBackground.png b/ProjectLighthouse.Servers.Website/StaticFiles/assets/slotCardBackground.png similarity index 100% rename from ProjectLighthouse/StaticFiles/assets/slotCardBackground.png rename to ProjectLighthouse.Servers.Website/StaticFiles/assets/slotCardBackground.png diff --git a/ProjectLighthouse/StaticFiles/assets/slotCardOverlay.png b/ProjectLighthouse.Servers.Website/StaticFiles/assets/slotCardOverlay.png similarity index 100% rename from ProjectLighthouse/StaticFiles/assets/slotCardOverlay.png rename to ProjectLighthouse.Servers.Website/StaticFiles/assets/slotCardOverlay.png diff --git a/ProjectLighthouse/StaticFiles/browserconfig.xml b/ProjectLighthouse.Servers.Website/StaticFiles/browserconfig.xml similarity index 100% rename from ProjectLighthouse/StaticFiles/browserconfig.xml rename to ProjectLighthouse.Servers.Website/StaticFiles/browserconfig.xml diff --git a/ProjectLighthouse/StaticFiles/css/semantic.min.css b/ProjectLighthouse.Servers.Website/StaticFiles/css/semantic.min.css similarity index 100% rename from ProjectLighthouse/StaticFiles/css/semantic.min.css rename to ProjectLighthouse.Servers.Website/StaticFiles/css/semantic.min.css diff --git a/ProjectLighthouse/StaticFiles/css/styles.css b/ProjectLighthouse.Servers.Website/StaticFiles/css/styles.css similarity index 100% rename from ProjectLighthouse/StaticFiles/css/styles.css rename to ProjectLighthouse.Servers.Website/StaticFiles/css/styles.css diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/brand-icons.eot b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/brand-icons.eot similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/brand-icons.eot rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/brand-icons.eot diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/brand-icons.svg b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/brand-icons.svg similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/brand-icons.svg rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/brand-icons.svg diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/brand-icons.ttf b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/brand-icons.ttf similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/brand-icons.ttf rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/brand-icons.ttf diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/brand-icons.woff b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/brand-icons.woff similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/brand-icons.woff rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/brand-icons.woff diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/brand-icons.woff2 b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/brand-icons.woff2 similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/brand-icons.woff2 rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/brand-icons.woff2 diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/icons.eot b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/icons.eot similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/icons.eot rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/icons.eot diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/icons.svg b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/icons.svg similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/icons.svg rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/icons.svg diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/icons.ttf b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/icons.ttf similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/icons.ttf rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/icons.ttf diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/icons.woff b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/icons.woff similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/icons.woff rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/icons.woff diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/icons.woff2 b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/icons.woff2 similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/icons.woff2 rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/icons.woff2 diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/outline-icons.eot b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/outline-icons.eot similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/outline-icons.eot rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/outline-icons.eot diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/outline-icons.svg b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/outline-icons.svg similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/outline-icons.svg rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/outline-icons.svg diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/outline-icons.ttf b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/outline-icons.ttf similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/outline-icons.ttf rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/outline-icons.ttf diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/outline-icons.woff b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/outline-icons.woff similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/outline-icons.woff rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/outline-icons.woff diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/outline-icons.woff2 b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/outline-icons.woff2 similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/fonts/outline-icons.woff2 rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/fonts/outline-icons.woff2 diff --git a/ProjectLighthouse/StaticFiles/css/themes/default/assets/images/flags.png b/ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/images/flags.png similarity index 100% rename from ProjectLighthouse/StaticFiles/css/themes/default/assets/images/flags.png rename to ProjectLighthouse.Servers.Website/StaticFiles/css/themes/default/assets/images/flags.png diff --git a/ProjectLighthouse/StaticFiles/favicon-16x16.png b/ProjectLighthouse.Servers.Website/StaticFiles/favicon-16x16.png similarity index 100% rename from ProjectLighthouse/StaticFiles/favicon-16x16.png rename to ProjectLighthouse.Servers.Website/StaticFiles/favicon-16x16.png diff --git a/ProjectLighthouse/StaticFiles/favicon-32x32.png b/ProjectLighthouse.Servers.Website/StaticFiles/favicon-32x32.png similarity index 100% rename from ProjectLighthouse/StaticFiles/favicon-32x32.png rename to ProjectLighthouse.Servers.Website/StaticFiles/favicon-32x32.png diff --git a/ProjectLighthouse/StaticFiles/favicon.ico b/ProjectLighthouse.Servers.Website/StaticFiles/favicon.ico similarity index 100% rename from ProjectLighthouse/StaticFiles/favicon.ico rename to ProjectLighthouse.Servers.Website/StaticFiles/favicon.ico diff --git a/ProjectLighthouse/StaticFiles/logo-color.png b/ProjectLighthouse.Servers.Website/StaticFiles/logo-color.png similarity index 100% rename from ProjectLighthouse/StaticFiles/logo-color.png rename to ProjectLighthouse.Servers.Website/StaticFiles/logo-color.png diff --git a/ProjectLighthouse/StaticFiles/logo-mono.png b/ProjectLighthouse.Servers.Website/StaticFiles/logo-mono.png similarity index 100% rename from ProjectLighthouse/StaticFiles/logo-mono.png rename to ProjectLighthouse.Servers.Website/StaticFiles/logo-mono.png diff --git a/ProjectLighthouse/StaticFiles/logo-pride.png b/ProjectLighthouse.Servers.Website/StaticFiles/logo-pride.png similarity index 100% rename from ProjectLighthouse/StaticFiles/logo-pride.png rename to ProjectLighthouse.Servers.Website/StaticFiles/logo-pride.png diff --git a/ProjectLighthouse/StaticFiles/logo.svg b/ProjectLighthouse.Servers.Website/StaticFiles/logo.svg similarity index 100% rename from ProjectLighthouse/StaticFiles/logo.svg rename to ProjectLighthouse.Servers.Website/StaticFiles/logo.svg diff --git a/ProjectLighthouse/StaticFiles/mstile-150x150.png b/ProjectLighthouse.Servers.Website/StaticFiles/mstile-150x150.png similarity index 100% rename from ProjectLighthouse/StaticFiles/mstile-150x150.png rename to ProjectLighthouse.Servers.Website/StaticFiles/mstile-150x150.png diff --git a/ProjectLighthouse/StaticFiles/safari-pinned-tab.svg b/ProjectLighthouse.Servers.Website/StaticFiles/safari-pinned-tab.svg similarity index 100% rename from ProjectLighthouse/StaticFiles/safari-pinned-tab.svg rename to ProjectLighthouse.Servers.Website/StaticFiles/safari-pinned-tab.svg diff --git a/ProjectLighthouse/StaticFiles/site.webmanifest b/ProjectLighthouse.Servers.Website/StaticFiles/site.webmanifest similarity index 100% rename from ProjectLighthouse/StaticFiles/site.webmanifest rename to ProjectLighthouse.Servers.Website/StaticFiles/site.webmanifest From 304a898a1e0f65aca8bc875f37b750f3ef3366f7 Mon Sep 17 00:00:00 2001 From: Slendy Date: Sat, 20 Jan 2024 16:17:29 -0600 Subject: [PATCH 2/2] Update Dockerfile to use new StaticFiles folder --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6f758e0fa..0fc96c716 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false # Copy build files COPY --from=build /ProjectLighthouse/publish /lighthouse/app -COPY --from=build /ProjectLighthouse/ProjectLighthouse/StaticFiles /lighthouse/temp/StaticFiles +COPY --from=build /ProjectLighthouse/ProjectLighthouse.Servers.Website/StaticFiles /lighthouse/temp/StaticFiles COPY --from=build /ProjectLighthouse/scripts-and-tools/docker-entrypoint.sh /lighthouse RUN chown -R lighthouse:lighthouse /lighthouse && \