ToxicMushroom/mare.server
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.server.git synced 2026-02-03 00:44:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ac51ab5390 into 6071598b59

Browse source
This commit is contained in:
Samantha Neubeck 2025-08-23 22:26:28 -05:00 • committed by GitHub
commit 4465982faa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 47 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Docker/build/Dockerfile-MareSynchronosAuthService-git
View file

@ -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/ WORKDIR /server/MareSynchronosServer/MareSynchronosAuthService/
@ -10,7 +14,7 @@ RUN dotnet publish \
--output=/MareSynchronosAuthService \ --output=/MareSynchronosAuthService \
MareSynchronosAuthService.csproj MareSynchronosAuthService.csproj
FROM mcr.microsoft.com/dotnet/aspnet:8.0 FROM mcr.microsoft.com/dotnet/aspnet:9.0
RUN adduser \ RUN adduser \
--disabled-password \ --disabled-password \

10
Docker/build/Dockerfile-MareSynchronosServer-git
View file

@ -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/MareSynchronosServer /server/MareSynchronosServer/MareSynchronosServer
WORKDIR /server/MareSynchronosServer/MareSynchronosServer/ WORKDIR /server/MareSynchronosServer/MareSynchronosServer/
@ -10,7 +14,7 @@ RUN dotnet publish \
--output=/MareSynchronosServer \ --output=/MareSynchronosServer \
MareSynchronosServer.csproj MareSynchronosServer.csproj
FROM mcr.microsoft.com/dotnet/aspnet:8.0 FROM mcr.microsoft.com/dotnet/aspnet:9.0
RUN adduser \ RUN adduser \
--disabled-password \ --disabled-password \

10
Docker/build/Dockerfile-MareSynchronosServices-git
View file

@ -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/ WORKDIR /server/MareSynchronosServer/MareSynchronosServices/
@ -10,7 +14,7 @@ RUN dotnet publish \
--output=/MareSynchronosServices \ --output=/MareSynchronosServices \
MareSynchronosServices.csproj MareSynchronosServices.csproj
FROM mcr.microsoft.com/dotnet/aspnet:8.0 FROM mcr.microsoft.com/dotnet/aspnet:9.0
RUN adduser \ RUN adduser \
--disabled-password \ --disabled-password \

6
Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git
View file

@ -1,6 +1,10 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD 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/ WORKDIR /server/MareSynchronosServer/MareSynchronosStaticFilesServer/

4
Docker/build/linux-git/docker-build-authservice.sh
View file

@ -1,2 +1,4 @@
#!/bin/sh #!/bin/sh
docker build -t darkarchon/mare-synchronos-authservice:latest . -f ../Dockerfile-MareSynchronosAuthService-git --no-cache --pull --force-rm cd ../../../
docker build -t darkarchon/mare-synchronos-authservice:latest . -f Docker/build/Dockerfile-MareSynchronosAuthService-git --no-cache --pull --force-rm
cd Docker/build/linux-git

4
Docker/build/linux-git/docker-build-server.sh
View file

@ -1,2 +1,4 @@
#!/bin/sh #!/bin/sh
docker build -t darkarchon/mare-synchronos-server:latest . -f ../Dockerfile-MareSynchronosServer-git --no-cache --pull --force-rm cd ../../../
docker build -t darkarchon/mare-synchronos-server:latest . -f Docker/build/Dockerfile-MareSynchronosServer-git --no-cache --pull --force-rm
cd Docker/build/linux-git

4
Docker/build/linux-git/docker-build-services.sh
View file

@ -1,2 +1,4 @@
#!/bin/sh #!/bin/sh
docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices-git --no-cache --pull --force-rm cd ../../../
docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices-git --no-cache --pull --force-rm
cd Docker/build/linux-git

4
Docker/build/linux-git/docker-build-staticfilesserver.sh
View file

@ -1,2 +1,4 @@
#!/bin/sh #!/bin/sh
docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f ../Dockerfile-MareSynchronosStaticFilesServer-git --no-cache --pull --force-rm 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

4
Docker/build/linux-local/docker-build-authservice.sh
View file

@ -1,2 +1,4 @@
#!/bin/sh #!/bin/sh
docker build -t darkarchon/mare-synchronos-authservice:latest . -f ../Dockerfile-MareSynchronosAuthService --no-cache --pull --force-rm cd ../../../
docker build -t darkarchon/mare-synchronos-authservice:latest . -f Docker/build/Dockerfile-MareSynchronosAuthService --no-cache --pull --force-rm
cd Docker/build/linux-local

4
Docker/build/linux-local/docker-build-server.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
cd ../../../ cd ../../../
docker build -t darkarchon/mare-synchronos-server:latest . -f ../Dockerfile-MareSynchronosServer --no-cache --pull --force-rm docker build -t darkarchon/mare-synchronos-server:latest . -f Docker/build/Dockerfile-MareSynchronosServer --no-cache --pull --force-rm
cd Docker/build/linux-local cd Docker/build/linux-local

4
Docker/build/linux-local/docker-build-services.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
cd ../../../ cd ../../../
docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices --no-cache --pull --force-rm docker build -t darkarchon/mare-synchronos-services:latest . -f Docker/build/Dockerfile-MareSynchronosServices --no-cache --pull --force-rm
cd Docker/build/linux-local cd Docker/build/linux-local

4
Docker/build/linux-local/docker-build-staticfilesserver.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
cd ../../../ cd ../../../
docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f ../Dockerfile-MareSynchronosStaticFilesServer --no-cache --pull --force-rm docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f Docker/build/Dockerfile-MareSynchronosStaticFilesServer --no-cache --pull --force-rm
cd Docker/build/linux-local cd Docker/build/linux-local