From 0a87e7f80dd5b5a68c2c805961a9ca322810feb0 Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:03:40 -0500 Subject: [PATCH 01/16] Update local linux build files --- Docker/build/linux-local/docker-build-authservice.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Docker/build/linux-local/docker-build-authservice.sh b/Docker/build/linux-local/docker-build-authservice.sh index 87859cd..387e88b 100644 --- a/Docker/build/linux-local/docker-build-authservice.sh +++ b/Docker/build/linux-local/docker-build-authservice.sh @@ -1,2 +1,4 @@ #!/bin/sh -docker build -t darkarchon/mare-synchronos-authservice:latest . -f ../Dockerfile-MareSynchronosAuthService --no-cache --pull --force-rm \ No newline at end of file +cd ../../../ +docker build -t darkarchon/mare-synchronos-authservice:latest . -f Docker/build/Dockerfile-MareSynchronosAuthService --no-cache --pull --force-rm +cd Docker/build/linux-local From 2d1b80af3b314be8883c55aa0c788282ae4f7f6f Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:07:28 -0500 Subject: [PATCH 02/16] Update local linux build files --- Docker/build/linux-local/docker-build-server.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docker/build/linux-local/docker-build-server.sh b/Docker/build/linux-local/docker-build-server.sh index 4c511aa..4914496 100644 --- a/Docker/build/linux-local/docker-build-server.sh +++ b/Docker/build/linux-local/docker-build-server.sh @@ -1,4 +1,4 @@ #!/bin/sh cd ../../../ -docker build -t darkarchon/mare-synchronos-server:latest . -f ../Dockerfile-MareSynchronosServer --no-cache --pull --force-rm -cd Docker/build/linux-local \ No newline at end of file +docker build -t darkarchon/mare-synchronos-server:latest . -f Docker/build/Dockerfile-MareSynchronosServer --no-cache --pull --force-rm +cd Docker/build/linux-local From 688de5e0644b91bb63202c045126be3afb2504b2 Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:07:48 -0500 Subject: [PATCH 03/16] Update local linux build files --- Docker/build/linux-local/docker-build-services.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docker/build/linux-local/docker-build-services.sh b/Docker/build/linux-local/docker-build-services.sh index f5a7f5f..7e71f11 100644 --- a/Docker/build/linux-local/docker-build-services.sh +++ b/Docker/build/linux-local/docker-build-services.sh @@ -1,4 +1,4 @@ #!/bin/sh cd ../../../ -docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices --no-cache --pull --force-rm -cd Docker/build/linux-local \ No newline at end of file +docker build -t darkarchon/mare-synchronos-services:latest . -f Docker/build/Dockerfile-MareSynchronosServices --no-cache --pull --force-rm +cd Docker/build/linux-local From be02a123b6acced8b7bd50aa9091da24d4342e00 Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:08:04 -0500 Subject: [PATCH 04/16] Update docker-build-staticfilesserver.sh --- Docker/build/linux-local/docker-build-staticfilesserver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docker/build/linux-local/docker-build-staticfilesserver.sh b/Docker/build/linux-local/docker-build-staticfilesserver.sh index 3881a83..16547ed 100644 --- a/Docker/build/linux-local/docker-build-staticfilesserver.sh +++ b/Docker/build/linux-local/docker-build-staticfilesserver.sh @@ -1,4 +1,4 @@ #!/bin/sh cd ../../../ -docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f ../Dockerfile-MareSynchronosStaticFilesServer --no-cache --pull --force-rm -cd Docker/build/linux-local \ No newline at end of file +docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f Docker/build/Dockerfile-MareSynchronosStaticFilesServer --no-cache --pull --force-rm +cd Docker/build/linux-local From 45a2eef31eb71bf24f297ff7a6405bc0c8502857 Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:09:01 -0500 Subject: [PATCH 05/16] Update git linux build files --- Docker/build/linux-git/docker-build-authservice.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Docker/build/linux-git/docker-build-authservice.sh b/Docker/build/linux-git/docker-build-authservice.sh index fd7d396..02627fc 100644 --- a/Docker/build/linux-git/docker-build-authservice.sh +++ b/Docker/build/linux-git/docker-build-authservice.sh @@ -1,2 +1,4 @@ #!/bin/sh -docker build -t darkarchon/mare-synchronos-authservice:latest . -f ../Dockerfile-MareSynchronosAuthService-git --no-cache --pull --force-rm \ No newline at end of file +cd ../../../ +docker build -t darkarchon/mare-synchronos-authservice:latest . -f Docker/build/Dockerfile-MareSynchronosAuthService-git --no-cache --pull --force-rm +cd Docker/build/linux-local From 4c3a85191ea222840a9218af1fa44959989db0dc Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:10:05 -0500 Subject: [PATCH 06/16] Update git linux build files --- Docker/build/linux-git/docker-build-server.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Docker/build/linux-git/docker-build-server.sh b/Docker/build/linux-git/docker-build-server.sh index 1815f92..d4e91e0 100644 --- a/Docker/build/linux-git/docker-build-server.sh +++ b/Docker/build/linux-git/docker-build-server.sh @@ -1,2 +1,4 @@ #!/bin/sh -docker build -t darkarchon/mare-synchronos-server:latest . -f ../Dockerfile-MareSynchronosServer-git --no-cache --pull --force-rm \ No newline at end of file +cd ../../../ +docker build -t darkarchon/mare-synchronos-server:latest . -f Docker/build/Dockerfile-MareSynchronosServer-git --no-cache --pull --force-rm +cd Docker/build/linux-local From 55fad696475dac575b1e8abda9bfac027ad95303 Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:10:37 -0500 Subject: [PATCH 07/16] Update git linux build files --- Docker/build/linux-git/docker-build-services.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Docker/build/linux-git/docker-build-services.sh b/Docker/build/linux-git/docker-build-services.sh index 93f9be7..52fff68 100644 --- a/Docker/build/linux-git/docker-build-services.sh +++ b/Docker/build/linux-git/docker-build-services.sh @@ -1,2 +1,4 @@ #!/bin/sh -docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices-git --no-cache --pull --force-rm \ No newline at end of file +cd ../../../ +docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices-git --no-cache --pull --force-rm +cd Docker/build/linux-local From c9fd2b27dcfe2c0150333d8eeafb446e9d9d1aff Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:11:32 -0500 Subject: [PATCH 08/16] Update git linux build files --- Docker/build/linux-git/docker-build-staticfilesserver.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Docker/build/linux-git/docker-build-staticfilesserver.sh b/Docker/build/linux-git/docker-build-staticfilesserver.sh index 3ec753c..f6db6d3 100644 --- a/Docker/build/linux-git/docker-build-staticfilesserver.sh +++ b/Docker/build/linux-git/docker-build-staticfilesserver.sh @@ -1,2 +1,4 @@ #!/bin/sh -docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f ../Dockerfile-MareSynchronosStaticFilesServer-git --no-cache --pull --force-rm \ No newline at end of file +cd ../../../ +docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git --no-cache --pull --force-rm +cd Docker/build/linux-git From 26f8b8704f9e16a8a214c64838676d293b557199 Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:11:47 -0500 Subject: [PATCH 09/16] Update docker-build-authservice.sh --- Docker/build/linux-git/docker-build-authservice.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/build/linux-git/docker-build-authservice.sh b/Docker/build/linux-git/docker-build-authservice.sh index 02627fc..c758e15 100644 --- a/Docker/build/linux-git/docker-build-authservice.sh +++ b/Docker/build/linux-git/docker-build-authservice.sh @@ -1,4 +1,4 @@ #!/bin/sh cd ../../../ docker build -t darkarchon/mare-synchronos-authservice:latest . -f Docker/build/Dockerfile-MareSynchronosAuthService-git --no-cache --pull --force-rm -cd Docker/build/linux-local +cd Docker/build/linux-git From f8c487d713ef79e44dd3b652ede152046a622fd7 Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:11:58 -0500 Subject: [PATCH 10/16] Update docker-build-server.sh --- Docker/build/linux-git/docker-build-server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/build/linux-git/docker-build-server.sh b/Docker/build/linux-git/docker-build-server.sh index d4e91e0..e03b532 100644 --- a/Docker/build/linux-git/docker-build-server.sh +++ b/Docker/build/linux-git/docker-build-server.sh @@ -1,4 +1,4 @@ #!/bin/sh cd ../../../ docker build -t darkarchon/mare-synchronos-server:latest . -f Docker/build/Dockerfile-MareSynchronosServer-git --no-cache --pull --force-rm -cd Docker/build/linux-local +cd Docker/build/linux-git From b642e86b7cbd1d2aa8084f926dde0aa3d531cab7 Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:12:10 -0500 Subject: [PATCH 11/16] Update docker-build-services.sh --- Docker/build/linux-git/docker-build-services.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/build/linux-git/docker-build-services.sh b/Docker/build/linux-git/docker-build-services.sh index 52fff68..7fcaffd 100644 --- a/Docker/build/linux-git/docker-build-services.sh +++ b/Docker/build/linux-git/docker-build-services.sh @@ -1,4 +1,4 @@ #!/bin/sh cd ../../../ docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices-git --no-cache --pull --force-rm -cd Docker/build/linux-local +cd Docker/build/linux-git From 1ec168e46de5cb3391f25fa52aee4cb75c36adf6 Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:14:41 -0500 Subject: [PATCH 12/16] Update Dockerfile-MareSynchronosAuthService-git --- Docker/build/Dockerfile-MareSynchronosAuthService-git | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Docker/build/Dockerfile-MareSynchronosAuthService-git b/Docker/build/Dockerfile-MareSynchronosAuthService-git index de9b7c1..021fd62 100644 --- a/Docker/build/Dockerfile-MareSynchronosAuthService-git +++ b/Docker/build/Dockerfile-MareSynchronosAuthService-git @@ -1,6 +1,10 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:9.0 as BUILD -RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server +RUN git clone --recurse-submodules https://github.com/caraxi/mare.server + +COPY MareAPI /server/MareAPI +COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared +COPY MareSynchronosServer/MareSynchronosAuthService /server/MareSynchronosServer/MareSynchronosAuthService WORKDIR /server/MareSynchronosServer/MareSynchronosAuthService/ @@ -10,7 +14,7 @@ RUN dotnet publish \ --output=/MareSynchronosAuthService \ MareSynchronosAuthService.csproj -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 RUN adduser \ --disabled-password \ From 492b9c16f8625b3e37c6d7f48423af0f1e7b12fc Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:15:07 -0500 Subject: [PATCH 13/16] Update Dockerfile-MareSynchronosServer-git --- Docker/build/Dockerfile-MareSynchronosServer-git | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Docker/build/Dockerfile-MareSynchronosServer-git b/Docker/build/Dockerfile-MareSynchronosServer-git index fec5c0b..e27ba00 100644 --- a/Docker/build/Dockerfile-MareSynchronosServer-git +++ b/Docker/build/Dockerfile-MareSynchronosServer-git @@ -1,6 +1,10 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD -RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server +RUN git clone --recurse-submodules https://github.com/caraxi/mare.server + +COPY MareAPI /server/MareAPI +COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared +COPY MareSynchronosServer/MareSynchronosServer /server/MareSynchronosServer/MareSynchronosServer WORKDIR /server/MareSynchronosServer/MareSynchronosServer/ From 251134d0a20c299474f7cc59083b3f3de8a2110f Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:15:17 -0500 Subject: [PATCH 14/16] Update Dockerfile-MareSynchronosServer-git --- Docker/build/Dockerfile-MareSynchronosServer-git | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docker/build/Dockerfile-MareSynchronosServer-git b/Docker/build/Dockerfile-MareSynchronosServer-git index e27ba00..1191b4e 100644 --- a/Docker/build/Dockerfile-MareSynchronosServer-git +++ b/Docker/build/Dockerfile-MareSynchronosServer-git @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:9.0 as BUILD RUN git clone --recurse-submodules https://github.com/caraxi/mare.server @@ -14,7 +14,7 @@ RUN dotnet publish \ --output=/MareSynchronosServer \ MareSynchronosServer.csproj -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 RUN adduser \ --disabled-password \ From 6d7d1462fecf37687a255ebea5d4fa7eb82da19c Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:16:00 -0500 Subject: [PATCH 15/16] Update Dockerfile-MareSynchronosServices-git --- Docker/build/Dockerfile-MareSynchronosServices-git | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Docker/build/Dockerfile-MareSynchronosServices-git b/Docker/build/Dockerfile-MareSynchronosServices-git index 964d0ac..c0fb0e1 100644 --- a/Docker/build/Dockerfile-MareSynchronosServices-git +++ b/Docker/build/Dockerfile-MareSynchronosServices-git @@ -1,6 +1,10 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:9.0 as BUILD -RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server +RUN git clone --recurse-submodules https://github.com/caraxi/mare.server + +COPY MareAPI /server/MareAPI +COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared +COPY MareSynchronosServer/MareSynchronosServices /server/MareSynchronosServer/MareSynchronosServices WORKDIR /server/MareSynchronosServer/MareSynchronosServices/ @@ -10,7 +14,7 @@ RUN dotnet publish \ --output=/MareSynchronosServices \ MareSynchronosServices.csproj -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 RUN adduser \ --disabled-password \ From ac51ab53909115e0255aef45b6850f4ea687a383 Mon Sep 17 00:00:00 2001 From: Samantha Neubeck <2856339+Scassany@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:16:22 -0500 Subject: [PATCH 16/16] Update Dockerfile-MareSynchronosStaticFilesServer-git --- Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git index 579c38b..3d646e8 100644 --- a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git +++ b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git @@ -1,6 +1,10 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD -RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server +RUN git clone --recurse-submodules https://github.com/caraxi/mare.server + +COPY MareAPI /server/MareAPI +COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared +COPY MareSynchronosServer/MareSynchronosStaticFilesServer /server/MareSynchronosServer/MareSynchronosStaticFilesServer WORKDIR /server/MareSynchronosServer/MareSynchronosStaticFilesServer/