From 998ba21af764896128f6f4b9045ed21ea04f46a1 Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Sun, 11 May 2025 15:48:30 -0400 Subject: [PATCH 01/13] Attempt at fixing docker build. --- Servers/ApacheNet/Dockerfile | 4 +- Servers/Horizon/Dockerfile | 8 +-- Servers/Horizon/Horizon_docker.csproj | 46 +++++++++++++++++ Servers/MitmDNS/Dockerfile | 8 +-- Servers/MitmDNS/MitmDNS_docker.csproj | 42 ++++++++++++++++ Servers/MultiSocks/Dockerfile | 8 +-- Servers/MultiSocks/MultiSocks_docker.csproj | 46 +++++++++++++++++ Servers/MultiSpy/Dockerfile | 4 +- Servers/QuazalServer/Dockerfile | 9 ++-- .../QuazalServer/QuazalServer_docker.csproj | 43 ++++++++++++++++ Servers/SSFWServer/Dockerfile | 8 +-- Servers/SSFWServer/SSFWServer_docker.csproj | 45 +++++++++++++++++ Servers/SVO/Dockerfile | 8 +-- Servers/SVO/SVO_docker.csproj | 44 +++++++++++++++++ docker-compose.override.yml | 1 - docker-compose.yml | 49 +++++-------------- 16 files changed, 307 insertions(+), 66 deletions(-) create mode 100644 Servers/Horizon/Horizon_docker.csproj create mode 100644 Servers/MitmDNS/MitmDNS_docker.csproj create mode 100644 Servers/MultiSocks/MultiSocks_docker.csproj create mode 100644 Servers/QuazalServer/QuazalServer_docker.csproj create mode 100644 Servers/SSFWServer/SSFWServer_docker.csproj create mode 100644 Servers/SVO/SVO_docker.csproj delete mode 100644 docker-compose.override.yml diff --git a/Servers/ApacheNet/Dockerfile b/Servers/ApacheNet/Dockerfile index 7be085ad6..0ebf20433 100644 --- a/Servers/ApacheNet/Dockerfile +++ b/Servers/ApacheNet/Dockerfile @@ -5,8 +5,8 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["WebServers/MultiHTTP/MultiHTTP.csproj", "MultiHTTP/"] -RUN dotnet restore "WebServers/MultiHTTP/MultiHTTP.csproj" +COPY ["Servers/MultiHTTP/MultiHTTP.csproj", "MultiHTTP/"] +RUN dotnet restore "Servers/MultiHTTP/MultiHTTP.csproj" COPY . . WORKDIR "/src/MultiHTTP" RUN dotnet build "MultiHTTP.csproj" -c Release -o /app/build diff --git a/Servers/Horizon/Dockerfile b/Servers/Horizon/Dockerfile index 16eb88cf7..d04ccbe63 100644 --- a/Servers/Horizon/Dockerfile +++ b/Servers/Horizon/Dockerfile @@ -5,14 +5,14 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["SpecializedServers/Horizon/Horizon.csproj", "Horizon/"] -RUN dotnet restore "SpecializedServers/Horizon/Horizon.csproj" +COPY ["Servers/Horizon/Horizon_docker.csproj", "Horizon/"] +RUN dotnet restore "Horizon/Horizon_docker.csproj" COPY . . WORKDIR "/src/Horizon" -RUN dotnet build "Horizon.csproj" -c Release -o /app/build +RUN dotnet build "Horizon_docker.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "Horizon.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "Horizon_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app diff --git a/Servers/Horizon/Horizon_docker.csproj b/Servers/Horizon/Horizon_docker.csproj new file mode 100644 index 000000000..abee4ad67 --- /dev/null +++ b/Servers/Horizon/Horizon_docker.csproj @@ -0,0 +1,46 @@ + + + + Exe + net6.0 + enable + enable + Linux + -p 61920:61920 -p 50100:50100 -p 10075:10075 -p 10076:10076 -p 10077:10077 -p 10073:10073 -p 50000:50000 -p 10070:10070 -p 3101:3101 -p 2222:2222 -p 10373:10373 -p 10372:10372 -p 10071:10071 -p 10072:10072 -p 10079:10079 -p 10078:10078 -p 10080:10080 -p 65535:65535 + Horizon.ico + true + false + ..\.. + + + + + + + + + all + + + + + + + + + + + + + + + Always + + + + + + + + + diff --git a/Servers/MitmDNS/Dockerfile b/Servers/MitmDNS/Dockerfile index 93f5c8c87..f6ccc1533 100644 --- a/Servers/MitmDNS/Dockerfile +++ b/Servers/MitmDNS/Dockerfile @@ -5,14 +5,14 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["WebServers/MitmDNS/MitmDNS.csproj", "MitmDNS/"] -RUN dotnet restore "WebServers/MitmDNS/MitmDNS.csproj" +COPY ["Servers/MitmDNS/MitmDNS_docker.csproj", "MitmDNS/"] +RUN dotnet restore "MitmDNS/MitmDNS_docker.csproj" COPY . . WORKDIR "/src/MitmDNS" -RUN dotnet build "MitmDNS.csproj" -c Release -o /app/build +RUN dotnet build "MitmDNS_docker.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "MitmDNS.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "MitmDNS_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app diff --git a/Servers/MitmDNS/MitmDNS_docker.csproj b/Servers/MitmDNS/MitmDNS_docker.csproj new file mode 100644 index 000000000..d0babee6a --- /dev/null +++ b/Servers/MitmDNS/MitmDNS_docker.csproj @@ -0,0 +1,42 @@ + + + + Exe + net6.0 + Linux + -p 53:53 -p 65535:65535 + DNS.ico + true + ..\.. + + + + + + + + + + + + + + + Always + + + + + + all + + + + + + + + + + + diff --git a/Servers/MultiSocks/Dockerfile b/Servers/MultiSocks/Dockerfile index 4c55ab64a..61caa0ef4 100644 --- a/Servers/MultiSocks/Dockerfile +++ b/Servers/MultiSocks/Dockerfile @@ -5,14 +5,14 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["SpecializedServers/MultiSocks/MultiSocks.csproj", "MultiSocks/"] -RUN dotnet restore "SpecializedServers/MultiSocks/MultiSocks.csproj" +COPY ["Servers/MultiSocks/MultiSocks_docker.csproj", "MultiSocks/"] +RUN dotnet restore "MultiSocks/MultiSocks_docker.csproj" COPY . . WORKDIR "/src/MultiSocks" -RUN dotnet build "MultiSocks.csproj" -c Release -o /app/build +RUN dotnet build "MultiSocks_docker.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "MultiSocks.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "MultiSocks_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app diff --git a/Servers/MultiSocks/MultiSocks_docker.csproj b/Servers/MultiSocks/MultiSocks_docker.csproj new file mode 100644 index 000000000..890f10ec0 --- /dev/null +++ b/Servers/MultiSocks/MultiSocks_docker.csproj @@ -0,0 +1,46 @@ + + + + Exe + net6.0 + enable + enable + Linux + -p 11000-11000 -p 11050-11050 -p 11051-11051 -p 11100-11100 -p 11101-11101 -p 11140-11140 -p 18700-18700 -p 21850-21850 -p 21851-21851 -p 21870-21870 -p 21871-21871 -p 65535:65535 + MultiSocks.ico + true + ..\.. + + + + + + + + + Always + + + + + + all + + + + + + + + + + + + + + + + + + + diff --git a/Servers/MultiSpy/Dockerfile b/Servers/MultiSpy/Dockerfile index fd2a05348..22fc74232 100644 --- a/Servers/MultiSpy/Dockerfile +++ b/Servers/MultiSpy/Dockerfile @@ -5,8 +5,8 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["SpecializedServers/MultiSpy/MultiSpy.csproj", "MultiSpy/"] -RUN dotnet restore "SpecializedServers/MultiSpy/MultiSpy.csproj" +COPY ["Servers/MultiSpy/MultiSpy.csproj", "MultiSpy/"] +RUN dotnet restore "Servers/MultiSpy/MultiSpy.csproj" COPY . . WORKDIR "/src/MultiSpy" RUN dotnet build "MultiSpy.csproj" -c Release -o /app/build diff --git a/Servers/QuazalServer/Dockerfile b/Servers/QuazalServer/Dockerfile index d8aa1b476..351752301 100644 --- a/Servers/QuazalServer/Dockerfile +++ b/Servers/QuazalServer/Dockerfile @@ -5,14 +5,15 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["SpecializedServers/QuazalServer/QuazalServer.csproj", "QuazalServer/"] -RUN dotnet restore "SpecializedServers/QuazalServer/QuazalServer.csproj" +RUN mkdir -p QuazalServer +COPY ["Servers/QuazalServer/QuazalServer_docker.csproj", "QuazalServer/"] +RUN dotnet restore "QuazalServer/QuazalServer_docker.csproj" COPY . . WORKDIR "/src/QuazalServer" -RUN dotnet build "QuazalServer.csproj" -c Release -o /app/build +RUN dotnet build "QuazalServer_docker.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "QuazalServer.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "QuazalServer_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app diff --git a/Servers/QuazalServer/QuazalServer_docker.csproj b/Servers/QuazalServer/QuazalServer_docker.csproj new file mode 100644 index 000000000..2bab74a5e --- /dev/null +++ b/Servers/QuazalServer/QuazalServer_docker.csproj @@ -0,0 +1,43 @@ + + + + Exe + net6.0 + enable + enable + Linux + -p 21032:21032 -p 30160:30160 -p 30161:30161 -p 30200:30200 -p 30201:30201 -p 30560:30560 -p 30561:30561 -p 60001:60001 -p 60105:60105 -p 60106:60106 -p 60115:60115 -p 60116:60116 -p 61110:61110 -p 61111:61111 -p 61120:61120 -p 61121:61121 -p 61125:61125 -p 61126:61126 -p 61127:61127 -p 61128:61128 -p 61129:61129 -p 61130:61130 -p 61131:61131 -p 61132:61132 -p 61133:61133 -p 61134:61134 -p 61135:61135 -p 61136:61136 -p 61137:61137 -p 61138:61138 -p 62110:62110 -p 62111:62111 -p 62125:62125 -p 62126:62126 -p 62127:62127 -p 62128:62128 -p 65535:65535 + QuazalServer.ico + true + ..\.. + + + + + + + + + all + + + + + + + + Always + + + + + + + + + + + + + + diff --git a/Servers/SSFWServer/Dockerfile b/Servers/SSFWServer/Dockerfile index d29ee46df..a05d58d48 100644 --- a/Servers/SSFWServer/Dockerfile +++ b/Servers/SSFWServer/Dockerfile @@ -5,14 +5,14 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["SpecializedServers/SSFWServer/SSFWServer.csproj", "SSFWServer/"] -RUN dotnet restore "SpecializedServers/SSFWServer/SSFWServer.csproj" +COPY ["Servers/SSFWServer/SSFWServer_docker.csproj", "SSFWServer/"] +RUN dotnet restore "SSFWServer/SSFWServer_docker.csproj" COPY . . WORKDIR "/src/SSFWServer" -RUN dotnet build "SSFWServer.csproj" -c Release -o /app/build +RUN dotnet build "SSFWServer_docker.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "SSFWServer.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "SSFWServer_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app diff --git a/Servers/SSFWServer/SSFWServer_docker.csproj b/Servers/SSFWServer/SSFWServer_docker.csproj new file mode 100644 index 000000000..e5a48d8c8 --- /dev/null +++ b/Servers/SSFWServer/SSFWServer_docker.csproj @@ -0,0 +1,45 @@ + + + + Exe + net6.0 + enable + enable + Linux + -p 8080:8080 -p 10443:10443 -p 65535:65535 + SSFW.ico + true + ..\.. + + + + + + + + + all + + + + + + + + Always + + + + + + + + + + + + + + + + diff --git a/Servers/SVO/Dockerfile b/Servers/SVO/Dockerfile index 9a3d59a01..5df7d3f0d 100644 --- a/Servers/SVO/Dockerfile +++ b/Servers/SVO/Dockerfile @@ -5,14 +5,14 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["SpecializedServers/SVO/SVO.csproj", "SVO/"] -RUN dotnet restore "SpecializedServers/SVO/SVO.csproj" +COPY ["Servers/SVO/SVO_docker.csproj", "SVO/"] +RUN dotnet restore "SVO/SVO_docker.csproj" COPY . . WORKDIR "/src/SVO" -RUN dotnet build "SVO.csproj" -c Release -o /app/build +RUN dotnet build "SVO_docker.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "SVO.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "SVO_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app diff --git a/Servers/SVO/SVO_docker.csproj b/Servers/SVO/SVO_docker.csproj new file mode 100644 index 000000000..a1804f82f --- /dev/null +++ b/Servers/SVO/SVO_docker.csproj @@ -0,0 +1,44 @@ + + + + Exe + net6.0 + enable + enable + Linux + -p 10058:10058 -p 10060:10060 -p 10061:10061 -p 10062:10062 -p 65535:65535 + SVO.ico + true + ..\.. + + + + + + + + + all + + + + + + + + + + + + + + Always + + + + + + + + + diff --git a/docker-compose.override.yml b/docker-compose.override.yml deleted file mode 100644 index 8e89b0713..000000000 --- a/docker-compose.override.yml +++ /dev/null @@ -1 +0,0 @@ -version: '3.4' diff --git a/docker-compose.yml b/docker-compose.yml index f31a2ae56..144341aa1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,66 +1,41 @@ -version: '3.4' - services: horizon: - image: ${DOCKER_REGISTRY-}horizon + image: horizon build: context: . - dockerfile: SpecializedServers/Horizon/Dockerfile + dockerfile: Servers/Horizon/Dockerfile network_mode: "bridge" # Needed for SSL Handling multisocks: - image: ${DOCKER_REGISTRY-}multisocks + image: multisocks build: context: . - dockerfile: SpecializedServers/MultiSocks/Dockerfile + dockerfile: Servers/MultiSocks/Dockerfile network_mode: "bridge" # Needed for SSL Handling ssfwserver: - image: ${DOCKER_REGISTRY-}ssfwserver + image: ssfwserver build: context: . - dockerfile: SpecializedServers/SSFWServer/Dockerfile + dockerfile: Servers/SSFWServer/Dockerfile network_mode: "bridge" # Needed for SSL Handling svo: - image: ${DOCKER_REGISTRY-}svo - build: - context: . - dockerfile: SpecializedServers/SVO/Dockerfile - network_mode: "bridge" # Needed for SSL Handling - - httpsecureserverlite: - image: ${DOCKER_REGISTRY-}httpsecureserverlite + image: svo build: context: . - dockerfile: WebServers/HTTPSecureServerLite/Dockerfile + dockerfile: Servers/SVO/Dockerfile network_mode: "bridge" # Needed for SSL Handling - - databasemiddleware: - image: ${DOCKER_REGISTRY-}databasemiddleware - build: - context: . - dockerfile: MiddlewareServices/DatabaseMiddleware/Dockerfile - - quazalserver: - image: ${DOCKER_REGISTRY-}quazalserver + image: quazalserver build: context: . - dockerfile: SpecializedServers/QuazalServer/Dockerfile - - - httpserver: - image: ${DOCKER_REGISTRY-}httpserver - build: - context: . - dockerfile: WebServers/HTTPServer/Dockerfile - + dockerfile: Servers/QuazalServer/Dockerfile mitmdns: - image: ${DOCKER_REGISTRY-}mitmdns + image: mitmdns build: context: . - dockerfile: WebServers/MitmDNS/Dockerfile + dockerfile: Servers/MitmDNS/Dockerfile From f88fece88e48b6669a659ed95b4ba0081b2a7f5d Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Sun, 11 May 2025 20:00:40 -0400 Subject: [PATCH 02/13] Added in ApacheNet. --- Servers/ApacheNet/ApacheNet_docker.csproj | 43 +++++++++++++++++++++++ Servers/ApacheNet/Dockerfile | 13 +++---- docker-compose.yml | 6 ++++ 3 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 Servers/ApacheNet/ApacheNet_docker.csproj diff --git a/Servers/ApacheNet/ApacheNet_docker.csproj b/Servers/ApacheNet/ApacheNet_docker.csproj new file mode 100644 index 000000000..21ed344ce --- /dev/null +++ b/Servers/ApacheNet/ApacheNet_docker.csproj @@ -0,0 +1,43 @@ + + + + Exe + net6.0 + enable + Linux + -p 443:443 -p 65535:65535 + ApacheNet.ico + true + false + + + + + + + + + all + + + + + + + + + + + + + + + Always + + + + + + + + diff --git a/Servers/ApacheNet/Dockerfile b/Servers/ApacheNet/Dockerfile index 0ebf20433..01858294a 100644 --- a/Servers/ApacheNet/Dockerfile +++ b/Servers/ApacheNet/Dockerfile @@ -5,16 +5,17 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/MultiHTTP/MultiHTTP.csproj", "MultiHTTP/"] -RUN dotnet restore "Servers/MultiHTTP/MultiHTTP.csproj" +RUN mkdir -p ApacheNet +COPY ["Servers/ApacheNet/ApacheNet_docker.csproj", "ApacheNet/"] +RUN dotnet restore "ApacheNet/ApacheNet_docker.csproj" COPY . . -WORKDIR "/src/MultiHTTP" -RUN dotnet build "MultiHTTP.csproj" -c Release -o /app/build +WORKDIR "/src/ApacheNet" +RUN dotnet build "ApacheNet_docker.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "MultiHTTP.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "ApacheNet_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "MultiHTTP.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "ApacheNet.dll"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 144341aa1..2b6e4e442 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,3 +39,9 @@ services: context: . dockerfile: Servers/MitmDNS/Dockerfile + apachenet: + image: apachenet + build: + context: . + dockerfile: Servers/ApacheNet/Dockerfile + From b640594625fe4699664ce6a0a9e4e6fba92bec18 Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Sun, 11 May 2025 20:33:39 -0400 Subject: [PATCH 03/13] Added full directory into Docker build. --- Servers/ApacheNet/Dockerfile | 2 +- Servers/Horizon/Dockerfile | 2 +- Servers/MitmDNS/Dockerfile | 2 +- Servers/MultiSocks/Dockerfile | 2 +- Servers/QuazalServer/Dockerfile | 2 +- Servers/SSFWServer/Dockerfile | 2 +- Servers/SVO/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Servers/ApacheNet/Dockerfile b/Servers/ApacheNet/Dockerfile index 01858294a..38635049c 100644 --- a/Servers/ApacheNet/Dockerfile +++ b/Servers/ApacheNet/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src RUN mkdir -p ApacheNet -COPY ["Servers/ApacheNet/ApacheNet_docker.csproj", "ApacheNet/"] +COPY ["Servers/ApacheNet/*", "ApacheNet/"] RUN dotnet restore "ApacheNet/ApacheNet_docker.csproj" COPY . . WORKDIR "/src/ApacheNet" diff --git a/Servers/Horizon/Dockerfile b/Servers/Horizon/Dockerfile index d04ccbe63..83c6cfb48 100644 --- a/Servers/Horizon/Dockerfile +++ b/Servers/Horizon/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/Horizon/Horizon_docker.csproj", "Horizon/"] +COPY ["Servers/Horizon/*", "Horizon/"] RUN dotnet restore "Horizon/Horizon_docker.csproj" COPY . . WORKDIR "/src/Horizon" diff --git a/Servers/MitmDNS/Dockerfile b/Servers/MitmDNS/Dockerfile index f6ccc1533..e4f4559bb 100644 --- a/Servers/MitmDNS/Dockerfile +++ b/Servers/MitmDNS/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/MitmDNS/MitmDNS_docker.csproj", "MitmDNS/"] +COPY ["Servers/MitmDNS/*", "MitmDNS/"] RUN dotnet restore "MitmDNS/MitmDNS_docker.csproj" COPY . . WORKDIR "/src/MitmDNS" diff --git a/Servers/MultiSocks/Dockerfile b/Servers/MultiSocks/Dockerfile index 61caa0ef4..257837075 100644 --- a/Servers/MultiSocks/Dockerfile +++ b/Servers/MultiSocks/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/MultiSocks/MultiSocks_docker.csproj", "MultiSocks/"] +COPY ["Servers/MultiSocks/*", "MultiSocks/"] RUN dotnet restore "MultiSocks/MultiSocks_docker.csproj" COPY . . WORKDIR "/src/MultiSocks" diff --git a/Servers/QuazalServer/Dockerfile b/Servers/QuazalServer/Dockerfile index 351752301..72dfdd939 100644 --- a/Servers/QuazalServer/Dockerfile +++ b/Servers/QuazalServer/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src RUN mkdir -p QuazalServer -COPY ["Servers/QuazalServer/QuazalServer_docker.csproj", "QuazalServer/"] +COPY ["Servers/QuazalServer/*", "QuazalServer/"] RUN dotnet restore "QuazalServer/QuazalServer_docker.csproj" COPY . . WORKDIR "/src/QuazalServer" diff --git a/Servers/SSFWServer/Dockerfile b/Servers/SSFWServer/Dockerfile index a05d58d48..c1adc49ac 100644 --- a/Servers/SSFWServer/Dockerfile +++ b/Servers/SSFWServer/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/SSFWServer/SSFWServer_docker.csproj", "SSFWServer/"] +COPY ["Servers/SSFWServer/*", "SSFWServer/"] RUN dotnet restore "SSFWServer/SSFWServer_docker.csproj" COPY . . WORKDIR "/src/SSFWServer" diff --git a/Servers/SVO/Dockerfile b/Servers/SVO/Dockerfile index 5df7d3f0d..a26f20fcc 100644 --- a/Servers/SVO/Dockerfile +++ b/Servers/SVO/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/SVO/SVO_docker.csproj", "SVO/"] +COPY ["Servers/SVO/*", "SVO/"] RUN dotnet restore "SVO/SVO_docker.csproj" COPY . . WORKDIR "/src/SVO" From 5b73c041565f13e8ae611a2ad1a232c6b6fa99b0 Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Sun, 11 May 2025 20:53:59 -0400 Subject: [PATCH 04/13] Docker compose fixed except for Horizon. AppSettings not found. --- Servers/ApacheNet/ApacheNet_docker.csproj | 2 +- Servers/ApacheNet/Dockerfile | 2 +- Servers/Horizon/Dockerfile | 2 +- Servers/Horizon/Horizon_docker.csproj | 2 +- Servers/MitmDNS/Dockerfile | 2 +- Servers/MitmDNS/MitmDNS_docker.csproj | 2 +- Servers/MultiSocks/Dockerfile | 2 +- Servers/MultiSocks/MultiSocks_docker.csproj | 2 +- Servers/QuazalServer/Dockerfile | 2 +- Servers/QuazalServer/QuazalServer_docker.csproj | 2 +- Servers/SSFWServer/Dockerfile | 2 +- Servers/SSFWServer/SSFWServer_docker.csproj | 2 +- Servers/SVO/Dockerfile | 2 +- Servers/SVO/SVO_docker.csproj | 2 +- docker-compose.yml | 12 ++++++------ 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Servers/ApacheNet/ApacheNet_docker.csproj b/Servers/ApacheNet/ApacheNet_docker.csproj index 21ed344ce..11a8851ba 100644 --- a/Servers/ApacheNet/ApacheNet_docker.csproj +++ b/Servers/ApacheNet/ApacheNet_docker.csproj @@ -37,7 +37,7 @@ - + diff --git a/Servers/ApacheNet/Dockerfile b/Servers/ApacheNet/Dockerfile index 38635049c..c3845694b 100644 --- a/Servers/ApacheNet/Dockerfile +++ b/Servers/ApacheNet/Dockerfile @@ -18,4 +18,4 @@ RUN dotnet publish "ApacheNet_docker.csproj" -c Release -o /app/publish /p:UseAp FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "ApacheNet.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "ApacheNet_docker.dll"] \ No newline at end of file diff --git a/Servers/Horizon/Dockerfile b/Servers/Horizon/Dockerfile index 83c6cfb48..da37bf473 100644 --- a/Servers/Horizon/Dockerfile +++ b/Servers/Horizon/Dockerfile @@ -17,4 +17,4 @@ RUN dotnet publish "Horizon_docker.csproj" -c Release -o /app/publish /p:UseAppH FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Horizon.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "Horizon_docker.dll"] \ No newline at end of file diff --git a/Servers/Horizon/Horizon_docker.csproj b/Servers/Horizon/Horizon_docker.csproj index abee4ad67..bf695934c 100644 --- a/Servers/Horizon/Horizon_docker.csproj +++ b/Servers/Horizon/Horizon_docker.csproj @@ -40,7 +40,7 @@ - + diff --git a/Servers/MitmDNS/Dockerfile b/Servers/MitmDNS/Dockerfile index e4f4559bb..493a9f14b 100644 --- a/Servers/MitmDNS/Dockerfile +++ b/Servers/MitmDNS/Dockerfile @@ -17,4 +17,4 @@ RUN dotnet publish "MitmDNS_docker.csproj" -c Release -o /app/publish /p:UseAppH FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "MitmDNS.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "MitmDNS_docker.dll"] \ No newline at end of file diff --git a/Servers/MitmDNS/MitmDNS_docker.csproj b/Servers/MitmDNS/MitmDNS_docker.csproj index d0babee6a..0929fe936 100644 --- a/Servers/MitmDNS/MitmDNS_docker.csproj +++ b/Servers/MitmDNS/MitmDNS_docker.csproj @@ -36,7 +36,7 @@ - + diff --git a/Servers/MultiSocks/Dockerfile b/Servers/MultiSocks/Dockerfile index 257837075..cca1dbcab 100644 --- a/Servers/MultiSocks/Dockerfile +++ b/Servers/MultiSocks/Dockerfile @@ -17,4 +17,4 @@ RUN dotnet publish "MultiSocks_docker.csproj" -c Release -o /app/publish /p:UseA FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "MultiSocks.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "MultiSocks_docker.dll"] \ No newline at end of file diff --git a/Servers/MultiSocks/MultiSocks_docker.csproj b/Servers/MultiSocks/MultiSocks_docker.csproj index 890f10ec0..3d15b339f 100644 --- a/Servers/MultiSocks/MultiSocks_docker.csproj +++ b/Servers/MultiSocks/MultiSocks_docker.csproj @@ -40,7 +40,7 @@ - + diff --git a/Servers/QuazalServer/Dockerfile b/Servers/QuazalServer/Dockerfile index 72dfdd939..ba2059929 100644 --- a/Servers/QuazalServer/Dockerfile +++ b/Servers/QuazalServer/Dockerfile @@ -18,4 +18,4 @@ RUN dotnet publish "QuazalServer_docker.csproj" -c Release -o /app/publish /p:Us FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "QuazalServer.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "QuazalServer_docker.dll"] \ No newline at end of file diff --git a/Servers/QuazalServer/QuazalServer_docker.csproj b/Servers/QuazalServer/QuazalServer_docker.csproj index 2bab74a5e..754e72bdf 100644 --- a/Servers/QuazalServer/QuazalServer_docker.csproj +++ b/Servers/QuazalServer/QuazalServer_docker.csproj @@ -37,7 +37,7 @@ - + diff --git a/Servers/SSFWServer/Dockerfile b/Servers/SSFWServer/Dockerfile index c1adc49ac..67a9b6845 100644 --- a/Servers/SSFWServer/Dockerfile +++ b/Servers/SSFWServer/Dockerfile @@ -17,4 +17,4 @@ RUN dotnet publish "SSFWServer_docker.csproj" -c Release -o /app/publish /p:UseA FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "SSFWServer.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "SSFWServer_docker.dll"] \ No newline at end of file diff --git a/Servers/SSFWServer/SSFWServer_docker.csproj b/Servers/SSFWServer/SSFWServer_docker.csproj index e5a48d8c8..adf3c0303 100644 --- a/Servers/SSFWServer/SSFWServer_docker.csproj +++ b/Servers/SSFWServer/SSFWServer_docker.csproj @@ -39,7 +39,7 @@ - + diff --git a/Servers/SVO/Dockerfile b/Servers/SVO/Dockerfile index a26f20fcc..148df4f9a 100644 --- a/Servers/SVO/Dockerfile +++ b/Servers/SVO/Dockerfile @@ -17,4 +17,4 @@ RUN dotnet publish "SVO_docker.csproj" -c Release -o /app/publish /p:UseAppHost= FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "SVO.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "SVO_docker.dll"] \ No newline at end of file diff --git a/Servers/SVO/SVO_docker.csproj b/Servers/SVO/SVO_docker.csproj index a1804f82f..80cc62b0c 100644 --- a/Servers/SVO/SVO_docker.csproj +++ b/Servers/SVO/SVO_docker.csproj @@ -38,7 +38,7 @@ - + diff --git a/docker-compose.yml b/docker-compose.yml index 2b6e4e442..77361d3fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,10 @@ services: - horizon: - image: horizon - build: - context: . - dockerfile: Servers/Horizon/Dockerfile - network_mode: "bridge" # Needed for SSL Handling + #horizon: + # image: horizon + # build: + # context: . + # dockerfile: Servers/Horizon/Dockerfile + # network_mode: "bridge" # Needed for SSL Handling multisocks: image: multisocks From c1a28008f8f09e47e33408702def9d4d63d8cc23 Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Sun, 11 May 2025 20:57:30 -0400 Subject: [PATCH 05/13] Added Riding Club Championships port. --- Servers/QuazalServer/QuazalServer.csproj | 2 +- Servers/QuazalServer/QuazalServer_docker.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Servers/QuazalServer/QuazalServer.csproj b/Servers/QuazalServer/QuazalServer.csproj index c4cbdeb1c..98e2ff71b 100644 --- a/Servers/QuazalServer/QuazalServer.csproj +++ b/Servers/QuazalServer/QuazalServer.csproj @@ -6,7 +6,7 @@ enable enable Linux - -p 21032:21032 -p 30160:30160 -p 30161:30161 -p 30200:30200 -p 30201:30201 -p 30560:30560 -p 30561:30561 -p 60001:60001 -p 60105:60105 -p 60106:60106 -p 60115:60115 -p 60116:60116 -p 61110:61110 -p 61111:61111 -p 61120:61120 -p 61121:61121 -p 61125:61125 -p 61126:61126 -p 61127:61127 -p 61128:61128 -p 61129:61129 -p 61130:61130 -p 61131:61131 -p 61132:61132 -p 61133:61133 -p 61134:61134 -p 61135:61135 -p 61136:61136 -p 61137:61137 -p 61138:61138 -p 62110:62110 -p 62111:62111 -p 62125:62125 -p 62126:62126 -p 62127:62127 -p 62128:62128 -p 65535:65535 + -p 21032:21032 -p 30160:30160 -p 30161:30161 -p 30200:30200 -p 30201:30201 -p 30550:30550 -p 30560:30560 -p 30561:30561 -p 60001:60001 -p 60105:60105 -p 60106:60106 -p 60115:60115 -p 60116:60116 -p 61110:61110 -p 61111:61111 -p 61120:61120 -p 61121:61121 -p 61125:61125 -p 61126:61126 -p 61127:61127 -p 61128:61128 -p 61129:61129 -p 61130:61130 -p 61131:61131 -p 61132:61132 -p 61133:61133 -p 61134:61134 -p 61135:61135 -p 61136:61136 -p 61137:61137 -p 61138:61138 -p 62110:62110 -p 62111:62111 -p 62125:62125 -p 62126:62126 -p 62127:62127 -p 62128:62128 -p 65535:65535 QuazalServer.ico true ..\.. diff --git a/Servers/QuazalServer/QuazalServer_docker.csproj b/Servers/QuazalServer/QuazalServer_docker.csproj index 754e72bdf..ef9c0011d 100644 --- a/Servers/QuazalServer/QuazalServer_docker.csproj +++ b/Servers/QuazalServer/QuazalServer_docker.csproj @@ -6,7 +6,7 @@ enable enable Linux - -p 21032:21032 -p 30160:30160 -p 30161:30161 -p 30200:30200 -p 30201:30201 -p 30560:30560 -p 30561:30561 -p 60001:60001 -p 60105:60105 -p 60106:60106 -p 60115:60115 -p 60116:60116 -p 61110:61110 -p 61111:61111 -p 61120:61120 -p 61121:61121 -p 61125:61125 -p 61126:61126 -p 61127:61127 -p 61128:61128 -p 61129:61129 -p 61130:61130 -p 61131:61131 -p 61132:61132 -p 61133:61133 -p 61134:61134 -p 61135:61135 -p 61136:61136 -p 61137:61137 -p 61138:61138 -p 62110:62110 -p 62111:62111 -p 62125:62125 -p 62126:62126 -p 62127:62127 -p 62128:62128 -p 65535:65535 + -p 21032:21032 -p 30160:30160 -p 30161:30161 -p 30200:30200 -p 30201:30201 -p 30550:30550 -p 30560:30560 -p 30561:30561 -p 60001:60001 -p 60105:60105 -p 60106:60106 -p 60115:60115 -p 60116:60116 -p 61110:61110 -p 61111:61111 -p 61120:61120 -p 61121:61121 -p 61125:61125 -p 61126:61126 -p 61127:61127 -p 61128:61128 -p 61129:61129 -p 61130:61130 -p 61131:61131 -p 61132:61132 -p 61133:61133 -p 61134:61134 -p 61135:61135 -p 61136:61136 -p 61137:61137 -p 61138:61138 -p 62110:62110 -p 62111:62111 -p 62125:62125 -p 62126:62126 -p 62127:62127 -p 62128:62128 -p 65535:65535 QuazalServer.ico true ..\.. From 2d4d7f8702c992b87ad6dc770bf901bcfc19d952 Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Sun, 11 May 2025 21:20:21 -0400 Subject: [PATCH 06/13] Exposed ports in docker compose file. --- docker-compose.yml | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 77361d3fe..8ac33654f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,19 @@ services: context: . dockerfile: Servers/MultiSocks/Dockerfile network_mode: "bridge" # Needed for SSL Handling + ports: + - "11000:11000" + - "11050:11050" + - "11051:11051" + - "11100:11100" + - "11101:11101" + - "11140:11140" + - "18700:18700" + - "21850:21850" + - "21851:21851" + - "21870:21870" + - "21871:21871" + - "65535:65535" ssfwserver: image: ssfwserver @@ -19,29 +32,47 @@ services: context: . dockerfile: Servers/SSFWServer/Dockerfile network_mode: "bridge" # Needed for SSL Handling - + ports: + - "8080:8080" + - "10443:10443" + - "65534:65535" + svo: image: svo build: context: . dockerfile: Servers/SVO/Dockerfile network_mode: "bridge" # Needed for SSL Handling - + ports: + - "10058:10058" + - "10060:10060" + - "10061:10061" + - "10062:10062" + - "65533:65535" + quazalserver: image: quazalserver build: context: . dockerfile: Servers/QuazalServer/Dockerfile + ports: + - "30550:30550" mitmdns: image: mitmdns build: context: . dockerfile: Servers/MitmDNS/Dockerfile - + ports: + - "53:53" # This breaks DNS, how to ensure localhost doesn't already use 53? + - "65532:65535" + apachenet: image: apachenet build: context: . dockerfile: Servers/ApacheNet/Dockerfile - + ports: + - "443:443" + - "65531:65535" + From c3aeef245e3a23b7cb3437d465931ef5c706e7c5 Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Mon, 12 May 2025 20:56:37 -0400 Subject: [PATCH 07/13] Put override back incase it is needed. Added Horizon back to compose. --- Servers/Horizon/Dockerfile | 4 +++- docker-compose.override.yml | 1 + docker-compose.yml | 25 ++++++++++++------------- 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 docker-compose.override.yml diff --git a/Servers/Horizon/Dockerfile b/Servers/Horizon/Dockerfile index da37bf473..653f1ad5f 100644 --- a/Servers/Horizon/Dockerfile +++ b/Servers/Horizon/Dockerfile @@ -5,6 +5,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src +RUN mkdir -p Horizon COPY ["Servers/Horizon/*", "Horizon/"] RUN dotnet restore "Horizon/Horizon_docker.csproj" COPY . . @@ -13,8 +14,9 @@ RUN dotnet build "Horizon_docker.csproj" -c Release -o /app/build FROM build AS publish RUN dotnet publish "Horizon_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN mkdir -p /app/publish FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Horizon_docker.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "Horizon_docker.dll"] diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 000000000..8e89b0713 --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1 @@ +version: '3.4' diff --git a/docker-compose.yml b/docker-compose.yml index 8ac33654f..db6f5dffa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,10 @@ services: - #horizon: - # image: horizon - # build: - # context: . - # dockerfile: Servers/Horizon/Dockerfile - # network_mode: "bridge" # Needed for SSL Handling + horizon: + image: horizon + build: + context: . + dockerfile: Servers/Horizon/Dockerfile + network_mode: "bridge" # Needed for SSL Handling multisocks: image: multisocks @@ -24,7 +24,7 @@ services: - "21851:21851" - "21870:21870" - "21871:21871" - - "65535:65535" + #- "65535:65535" # I don't think we use this ssfwserver: image: ssfwserver @@ -35,7 +35,7 @@ services: ports: - "8080:8080" - "10443:10443" - - "65534:65535" + #- "65534:65535" # I don't think we use this svo: image: svo @@ -48,7 +48,7 @@ services: - "10060:10060" - "10061:10061" - "10062:10062" - - "65533:65535" + #- "65533:65535" # I don't think we use this quazalserver: image: quazalserver @@ -64,8 +64,8 @@ services: context: . dockerfile: Servers/MitmDNS/Dockerfile ports: - - "53:53" # This breaks DNS, how to ensure localhost doesn't already use 53? - - "65532:65535" + #- "53:53" # This breaks DNS, how to ensure localhost doesn't already use 53? + - "65532:65535" # I don't think we use this apachenet: image: apachenet @@ -74,5 +74,4 @@ services: dockerfile: Servers/ApacheNet/Dockerfile ports: - "443:443" - - "65531:65535" - + #- "65531:65535" # I don't think we use this From 8534fb8c80fff1e3c84df02c35f75410f418d0fa Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Mon, 12 May 2025 21:02:23 -0400 Subject: [PATCH 08/13] Added all the ports into QuazalServer. --- docker-compose.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index db6f5dffa..30bbc692f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,7 +56,43 @@ services: context: . dockerfile: Servers/QuazalServer/Dockerfile ports: + - "21032:21032" + - "30160:30160" + - "30161:30161" + - "30200:30200" + - "30201:30201" - "30550:30550" + - "30560:30560" + - "30561:30561" + - "60001:60001" + - "60105:60105" + - "60106:60106" + - "60115:60115" + - "60116:60116" + - "61110:61110" + - "61111:61111" + - "61120:61120" + - "61121:61121" + - "61125:61125" + - "61126:61126" + - "61127:61127" + - "61128:61128" + - "61129:61129" + - "61130:61130" + - "61131:61131" + - "61132:61132" + - "61133:61133" + - "61134:61134" + - "61135:61135" + - "61136:61136" + - "61137:61137" + - "61138:61138" + - "62110:62110" + - "62111:62111" + - "62125:62125" + - "62126:62126" + - "62127:62127" + - "62128:62128" mitmdns: image: mitmdns From 8c8246eda5627a50ddd74216018147b4d3a7dd06 Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Mon, 12 May 2025 21:16:58 -0400 Subject: [PATCH 09/13] Docker build complete. --- .gitignore | 3 +++ Servers/ApacheNet/Dockerfile | 2 +- Servers/Horizon/Dockerfile | 3 ++- Servers/MitmDNS/Dockerfile | 2 +- Servers/MultiSocks/Dockerfile | 2 +- Servers/QuazalServer/Dockerfile | 2 +- Servers/SSFWServer/Dockerfile | 2 +- Servers/SVO/Dockerfile | 2 +- example.env | 1 + 9 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 example.env diff --git a/.gitignore b/.gitignore index 8a30d258e..e1062d038 100644 --- a/.gitignore +++ b/.gitignore @@ -396,3 +396,6 @@ FodyWeavers.xsd # JetBrains Rider *.sln.iml + +# Docker +.env \ No newline at end of file diff --git a/Servers/ApacheNet/Dockerfile b/Servers/ApacheNet/Dockerfile index c3845694b..3f8c281e1 100644 --- a/Servers/ApacheNet/Dockerfile +++ b/Servers/ApacheNet/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src RUN mkdir -p ApacheNet -COPY ["Servers/ApacheNet/*", "ApacheNet/"] +COPY ["Servers/ApacheNet/", "ApacheNet/"] RUN dotnet restore "ApacheNet/ApacheNet_docker.csproj" COPY . . WORKDIR "/src/ApacheNet" diff --git a/Servers/Horizon/Dockerfile b/Servers/Horizon/Dockerfile index 653f1ad5f..5612aa6b7 100644 --- a/Servers/Horizon/Dockerfile +++ b/Servers/Horizon/Dockerfile @@ -6,10 +6,11 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src RUN mkdir -p Horizon -COPY ["Servers/Horizon/*", "Horizon/"] +COPY ["Servers/Horizon/", "Horizon/"] RUN dotnet restore "Horizon/Horizon_docker.csproj" COPY . . WORKDIR "/src/Horizon" + RUN dotnet build "Horizon_docker.csproj" -c Release -o /app/build FROM build AS publish diff --git a/Servers/MitmDNS/Dockerfile b/Servers/MitmDNS/Dockerfile index 493a9f14b..a48d8c1db 100644 --- a/Servers/MitmDNS/Dockerfile +++ b/Servers/MitmDNS/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/MitmDNS/*", "MitmDNS/"] +COPY ["Servers/MitmDNS/", "MitmDNS/"] RUN dotnet restore "MitmDNS/MitmDNS_docker.csproj" COPY . . WORKDIR "/src/MitmDNS" diff --git a/Servers/MultiSocks/Dockerfile b/Servers/MultiSocks/Dockerfile index cca1dbcab..6f0e31207 100644 --- a/Servers/MultiSocks/Dockerfile +++ b/Servers/MultiSocks/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/MultiSocks/*", "MultiSocks/"] +COPY ["Servers/MultiSocks/", "MultiSocks/"] RUN dotnet restore "MultiSocks/MultiSocks_docker.csproj" COPY . . WORKDIR "/src/MultiSocks" diff --git a/Servers/QuazalServer/Dockerfile b/Servers/QuazalServer/Dockerfile index ba2059929..1b867a17f 100644 --- a/Servers/QuazalServer/Dockerfile +++ b/Servers/QuazalServer/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src RUN mkdir -p QuazalServer -COPY ["Servers/QuazalServer/*", "QuazalServer/"] +COPY ["Servers/QuazalServer/", "QuazalServer/"] RUN dotnet restore "QuazalServer/QuazalServer_docker.csproj" COPY . . WORKDIR "/src/QuazalServer" diff --git a/Servers/SSFWServer/Dockerfile b/Servers/SSFWServer/Dockerfile index 67a9b6845..3e8af1dc4 100644 --- a/Servers/SSFWServer/Dockerfile +++ b/Servers/SSFWServer/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/SSFWServer/*", "SSFWServer/"] +COPY ["Servers/SSFWServer/", "SSFWServer/"] RUN dotnet restore "SSFWServer/SSFWServer_docker.csproj" COPY . . WORKDIR "/src/SSFWServer" diff --git a/Servers/SVO/Dockerfile b/Servers/SVO/Dockerfile index 148df4f9a..2be94436d 100644 --- a/Servers/SVO/Dockerfile +++ b/Servers/SVO/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/SVO/*", "SVO/"] +COPY ["Servers/SVO/", "SVO/"] RUN dotnet restore "SVO/SVO_docker.csproj" COPY . . WORKDIR "/src/SVO" diff --git a/example.env b/example.env new file mode 100644 index 000000000..518076dde --- /dev/null +++ b/example.env @@ -0,0 +1 @@ +COMPOSE_BAKE=true From af1fa3bcce082cf6b4a808d637192207b1af9d9b Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Mon, 12 May 2025 21:23:44 -0400 Subject: [PATCH 10/13] Added README --- README.docker | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 README.docker diff --git a/README.docker b/README.docker new file mode 100644 index 000000000..23a968a13 --- /dev/null +++ b/README.docker @@ -0,0 +1,30 @@ +# Docker + +To use docker, you must have docker/docker-compose installed on your machine. From within the directory (with the docker-compose.yml file): + +``` +$ docker compose up -d +``` + +This will build all the images locally and run them. To stop (from within the same directoy as docker-compose.yml file): + +``` +$ docker compose down +``` + +You can use these same commands from Windows shell or Linux shell (on Linux you may need to do something special to allow access to port 53 if a DNS application is already running). + +Configuration options can be set by using a .env file. Right now it basically contains nothing. But it can be used in the future when images are saved remotely. + +``` +$ cp example.env .env +$ docker compose up -d +``` + +The docker compose command knows how to find and read a file named .env automatically. This file is added to .gitignore since it can contain personal info if you edit it to point to your own stuff. + +# TODO + +* Figure out where we want to publish the images +* Add Registry back to docker-compose.yml +* Add Registry to example.env \ No newline at end of file From f8d636f538d651a6328a72e82836dbd28a235f9f Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Mon, 12 May 2025 21:25:13 -0400 Subject: [PATCH 11/13] Added port 53 back in. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 30bbc692f..0d35a598d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -100,7 +100,7 @@ services: context: . dockerfile: Servers/MitmDNS/Dockerfile ports: - #- "53:53" # This breaks DNS, how to ensure localhost doesn't already use 53? + - "53:53" # This breaks DNS, how to ensure localhost doesn't already use 53? - "65532:65535" # I don't think we use this apachenet: From b2bc2e238ab89a28e21d43fbd32d548cf6c10b16 Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Mon, 12 May 2025 21:57:39 -0400 Subject: [PATCH 12/13] Switching network modes to host. Seems to be more reliable. --- docker-compose.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0d35a598d..c4a8db0db 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,14 +4,14 @@ services: build: context: . dockerfile: Servers/Horizon/Dockerfile - network_mode: "bridge" # Needed for SSL Handling + network_mode: "host" # Needed for SSL Handling multisocks: image: multisocks build: context: . dockerfile: Servers/MultiSocks/Dockerfile - network_mode: "bridge" # Needed for SSL Handling + network_mode: "host" # Needed for SSL Handling ports: - "11000:11000" - "11050:11050" @@ -31,7 +31,7 @@ services: build: context: . dockerfile: Servers/SSFWServer/Dockerfile - network_mode: "bridge" # Needed for SSL Handling + network_mode: "host" # Needed for SSL Handling ports: - "8080:8080" - "10443:10443" @@ -42,7 +42,7 @@ services: build: context: . dockerfile: Servers/SVO/Dockerfile - network_mode: "bridge" # Needed for SSL Handling + network_mode: "host" # Needed for SSL Handling ports: - "10058:10058" - "10060:10060" @@ -55,6 +55,7 @@ services: build: context: . dockerfile: Servers/QuazalServer/Dockerfile + network_mode: "host" ports: - "21032:21032" - "30160:30160" @@ -99,6 +100,7 @@ services: build: context: . dockerfile: Servers/MitmDNS/Dockerfile + network_mode: "host" ports: - "53:53" # This breaks DNS, how to ensure localhost doesn't already use 53? - "65532:65535" # I don't think we use this @@ -108,6 +110,7 @@ services: build: context: . dockerfile: Servers/ApacheNet/Dockerfile + network_mode: "host" ports: - "443:443" #- "65531:65535" # I don't think we use this From 9f854866e34fe51d7fa9a9ffa7cbcd99c295a2ca Mon Sep 17 00:00:00 2001 From: Jeffrey Ward Date: Fri, 20 Jun 2025 12:11:41 -0400 Subject: [PATCH 13/13] Updated to the Visual Studio Dockerfile --- Servers/ApacheNet/ApacheNet.csproj | 2 +- Servers/ApacheNet/ApacheNet_docker.csproj | 43 ----------------- Servers/ApacheNet/Dockerfile | 23 +++++++--- Servers/Horizon/Dockerfile | 26 +++++++---- Servers/Horizon/Horizon.csproj | 2 +- Servers/Horizon/Horizon_docker.csproj | 46 ------------------- Servers/MitmDNS/Dockerfile | 19 +++++--- Servers/MitmDNS/MitmDNS.csproj | 2 +- Servers/MitmDNS/MitmDNS_docker.csproj | 42 ----------------- Servers/MultiSocks/Dockerfile | 22 ++++++--- Servers/MultiSocks/MultiSocks.csproj | 2 +- Servers/MultiSocks/MultiSocks_docker.csproj | 46 ------------------- Servers/MultiSpy/Dockerfile | 11 ++++- Servers/MultiSpy/MultiSpy.csproj | 2 +- Servers/QuazalServer/Dockerfile | 20 +++++--- Servers/QuazalServer/QuazalServer.csproj | 2 +- .../QuazalServer/QuazalServer_docker.csproj | 43 ----------------- Servers/SSFWServer/Dockerfile | 21 ++++++--- Servers/SSFWServer/SSFWServer.csproj | 2 +- Servers/SSFWServer/SSFWServer_docker.csproj | 45 ------------------ Servers/SVO/Dockerfile | 22 ++++++--- Servers/SVO/SVO.csproj | 2 +- Servers/SVO/SVO_docker.csproj | 44 ------------------ 23 files changed, 123 insertions(+), 366 deletions(-) delete mode 100644 Servers/ApacheNet/ApacheNet_docker.csproj delete mode 100644 Servers/Horizon/Horizon_docker.csproj delete mode 100644 Servers/MitmDNS/MitmDNS_docker.csproj delete mode 100644 Servers/MultiSocks/MultiSocks_docker.csproj delete mode 100644 Servers/QuazalServer/QuazalServer_docker.csproj delete mode 100644 Servers/SSFWServer/SSFWServer_docker.csproj delete mode 100644 Servers/SVO/SVO_docker.csproj diff --git a/Servers/ApacheNet/ApacheNet.csproj b/Servers/ApacheNet/ApacheNet.csproj index af2d86ba5..82c39cd87 100644 --- a/Servers/ApacheNet/ApacheNet.csproj +++ b/Servers/ApacheNet/ApacheNet.csproj @@ -37,7 +37,7 @@ - + diff --git a/Servers/ApacheNet/ApacheNet_docker.csproj b/Servers/ApacheNet/ApacheNet_docker.csproj deleted file mode 100644 index 11a8851ba..000000000 --- a/Servers/ApacheNet/ApacheNet_docker.csproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - Exe - net6.0 - enable - Linux - -p 443:443 -p 65535:65535 - ApacheNet.ico - true - false - - - - - - - - - all - - - - - - - - - - - - - - - Always - - - - - - - - diff --git a/Servers/ApacheNet/Dockerfile b/Servers/ApacheNet/Dockerfile index 3f8c281e1..62e533d76 100644 --- a/Servers/ApacheNet/Dockerfile +++ b/Servers/ApacheNet/Dockerfile @@ -5,17 +5,26 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -RUN mkdir -p ApacheNet -COPY ["Servers/ApacheNet/", "ApacheNet/"] -RUN dotnet restore "ApacheNet/ApacheNet_docker.csproj" +COPY ["Servers/ApacheNet/ApacheNet.csproj", "Servers/ApacheNet/"] +COPY ["AuxiliaryServices/WebAPIService/WebAPIService.csproj", "AuxiliaryServices/WebAPIService/"] +COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"] +COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"] +COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"] +COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"] +COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"] +COPY ["BackendServices/DNSLibrary/DNSLibrary.csproj", "BackendServices/DNSLibrary/"] +COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"] +COPY ["BackendServices/WatsonWebserver/WatsonWebserver.csproj", "BackendServices/WatsonWebserver/"] +COPY ["BackendServices/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj", "BackendServices/SpaceWizards.HttpListener/"] +RUN dotnet restore "Servers/ApacheNet/ApacheNet.csproj" COPY . . -WORKDIR "/src/ApacheNet" -RUN dotnet build "ApacheNet_docker.csproj" -c Release -o /app/build +WORKDIR "/src/Servers/ApacheNet" +RUN dotnet build "ApacheNet.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "ApacheNet_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "ApacheNet.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "ApacheNet_docker.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "ApacheNet.dll"] \ No newline at end of file diff --git a/Servers/Horizon/Dockerfile b/Servers/Horizon/Dockerfile index 5612aa6b7..c5486ab97 100644 --- a/Servers/Horizon/Dockerfile +++ b/Servers/Horizon/Dockerfile @@ -5,19 +5,27 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -RUN mkdir -p Horizon -COPY ["Servers/Horizon/", "Horizon/"] -RUN dotnet restore "Horizon/Horizon_docker.csproj" +COPY ["Servers/Horizon/Horizon.csproj", "Servers/Horizon/"] +COPY ["AuxiliaryServices/HorizonService/HorizonService.csproj", "AuxiliaryServices/HorizonService/"] +COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"] +COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"] +COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"] +COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"] +COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"] +COPY ["AuxiliaryServices/WebAPIService/WebAPIService.csproj", "AuxiliaryServices/WebAPIService/"] +COPY ["BackendServices/PS2FloatLibrary/PS2FloatLibrary.csproj", "BackendServices/PS2FloatLibrary/"] +COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"] +COPY ["BackendServices/WatsonWebserver/WatsonWebserver.csproj", "BackendServices/WatsonWebserver/"] +COPY ["BackendServices/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj", "BackendServices/SpaceWizards.HttpListener/"] +RUN dotnet restore "Servers/Horizon/Horizon.csproj" COPY . . -WORKDIR "/src/Horizon" - -RUN dotnet build "Horizon_docker.csproj" -c Release -o /app/build +WORKDIR "/src/Servers/Horizon" +RUN dotnet build "Horizon.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "Horizon_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false -RUN mkdir -p /app/publish +RUN dotnet publish "Horizon.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Horizon_docker.dll"] +ENTRYPOINT ["dotnet", "Horizon.dll"] \ No newline at end of file diff --git a/Servers/Horizon/Horizon.csproj b/Servers/Horizon/Horizon.csproj index fbaac0fd6..ed2823371 100644 --- a/Servers/Horizon/Horizon.csproj +++ b/Servers/Horizon/Horizon.csproj @@ -40,7 +40,7 @@ - + diff --git a/Servers/Horizon/Horizon_docker.csproj b/Servers/Horizon/Horizon_docker.csproj deleted file mode 100644 index bf695934c..000000000 --- a/Servers/Horizon/Horizon_docker.csproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - Exe - net6.0 - enable - enable - Linux - -p 61920:61920 -p 50100:50100 -p 10075:10075 -p 10076:10076 -p 10077:10077 -p 10073:10073 -p 50000:50000 -p 10070:10070 -p 3101:3101 -p 2222:2222 -p 10373:10373 -p 10372:10372 -p 10071:10071 -p 10072:10072 -p 10079:10079 -p 10078:10078 -p 10080:10080 -p 65535:65535 - Horizon.ico - true - false - ..\.. - - - - - - - - - all - - - - - - - - - - - - - - - Always - - - - - - - - - diff --git a/Servers/MitmDNS/Dockerfile b/Servers/MitmDNS/Dockerfile index a48d8c1db..7cf64af95 100644 --- a/Servers/MitmDNS/Dockerfile +++ b/Servers/MitmDNS/Dockerfile @@ -5,16 +5,23 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/MitmDNS/", "MitmDNS/"] -RUN dotnet restore "MitmDNS/MitmDNS_docker.csproj" +COPY ["Servers/MitmDNS/MitmDNS.csproj", "Servers/MitmDNS/"] +COPY ["BackendServices/DNSLibrary/DNSLibrary.csproj", "BackendServices/DNSLibrary/"] +COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"] +COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"] +COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"] +COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"] +COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"] +COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"] +RUN dotnet restore "Servers/MitmDNS/MitmDNS.csproj" COPY . . -WORKDIR "/src/MitmDNS" -RUN dotnet build "MitmDNS_docker.csproj" -c Release -o /app/build +WORKDIR "/src/Servers/MitmDNS" +RUN dotnet build "MitmDNS.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "MitmDNS_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "MitmDNS.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "MitmDNS_docker.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "MitmDNS.dll"] \ No newline at end of file diff --git a/Servers/MitmDNS/MitmDNS.csproj b/Servers/MitmDNS/MitmDNS.csproj index 8193b5e6b..232576bd7 100644 --- a/Servers/MitmDNS/MitmDNS.csproj +++ b/Servers/MitmDNS/MitmDNS.csproj @@ -36,7 +36,7 @@ - + diff --git a/Servers/MitmDNS/MitmDNS_docker.csproj b/Servers/MitmDNS/MitmDNS_docker.csproj deleted file mode 100644 index 0929fe936..000000000 --- a/Servers/MitmDNS/MitmDNS_docker.csproj +++ /dev/null @@ -1,42 +0,0 @@ - - - - Exe - net6.0 - Linux - -p 53:53 -p 65535:65535 - DNS.ico - true - ..\.. - - - - - - - - - - - - - - - Always - - - - - - all - - - - - - - - - - - diff --git a/Servers/MultiSocks/Dockerfile b/Servers/MultiSocks/Dockerfile index 6f0e31207..60da4641f 100644 --- a/Servers/MultiSocks/Dockerfile +++ b/Servers/MultiSocks/Dockerfile @@ -5,16 +5,26 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/MultiSocks/", "MultiSocks/"] -RUN dotnet restore "MultiSocks/MultiSocks_docker.csproj" +COPY ["Servers/MultiSocks/MultiSocks.csproj", "Servers/MultiSocks/"] +COPY ["BlazeSDK/Blaze2SDK/Blaze2SDK.csproj", "BlazeSDK/Blaze2SDK/"] +COPY ["BlazeSDK/BlazeCommon/BlazeCommon.csproj", "BlazeSDK/BlazeCommon/"] +COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"] +COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"] +COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"] +COPY ["BlazeSDK/Tdf/Tdf.csproj", "BlazeSDK/Tdf/"] +COPY ["BlazeSDK/Blaze3SDK/Blaze3SDK.csproj", "BlazeSDK/Blaze3SDK/"] +COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"] +COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"] +COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"] +RUN dotnet restore "Servers/MultiSocks/MultiSocks.csproj" COPY . . -WORKDIR "/src/MultiSocks" -RUN dotnet build "MultiSocks_docker.csproj" -c Release -o /app/build +WORKDIR "/src/Servers/MultiSocks" +RUN dotnet build "MultiSocks.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "MultiSocks_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "MultiSocks.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "MultiSocks_docker.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "MultiSocks.dll"] \ No newline at end of file diff --git a/Servers/MultiSocks/MultiSocks.csproj b/Servers/MultiSocks/MultiSocks.csproj index f5362188e..a44431ee3 100644 --- a/Servers/MultiSocks/MultiSocks.csproj +++ b/Servers/MultiSocks/MultiSocks.csproj @@ -40,7 +40,7 @@ - + diff --git a/Servers/MultiSocks/MultiSocks_docker.csproj b/Servers/MultiSocks/MultiSocks_docker.csproj deleted file mode 100644 index 3d15b339f..000000000 --- a/Servers/MultiSocks/MultiSocks_docker.csproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - Exe - net6.0 - enable - enable - Linux - -p 11000-11000 -p 11050-11050 -p 11051-11051 -p 11100-11100 -p 11101-11101 -p 11140-11140 -p 18700-18700 -p 21850-21850 -p 21851-21851 -p 21870-21870 -p 21871-21871 -p 65535:65535 - MultiSocks.ico - true - ..\.. - - - - - - - - - Always - - - - - - all - - - - - - - - - - - - - - - - - - - diff --git a/Servers/MultiSpy/Dockerfile b/Servers/MultiSpy/Dockerfile index 22fc74232..694575594 100644 --- a/Servers/MultiSpy/Dockerfile +++ b/Servers/MultiSpy/Dockerfile @@ -5,10 +5,17 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/MultiSpy/MultiSpy.csproj", "MultiSpy/"] +COPY ["Servers/MultiSpy/MultiSpy.csproj", "Servers/MultiSpy/"] +COPY ["AuxiliaryServices/MultiSpyService/MultiSpyService.csproj", "AuxiliaryServices/MultiSpyService/"] +COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"] +COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"] +COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"] +COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"] +COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"] +COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"] RUN dotnet restore "Servers/MultiSpy/MultiSpy.csproj" COPY . . -WORKDIR "/src/MultiSpy" +WORKDIR "/src/Servers/MultiSpy" RUN dotnet build "MultiSpy.csproj" -c Release -o /app/build FROM build AS publish diff --git a/Servers/MultiSpy/MultiSpy.csproj b/Servers/MultiSpy/MultiSpy.csproj index de7f88c09..fdb31be97 100644 --- a/Servers/MultiSpy/MultiSpy.csproj +++ b/Servers/MultiSpy/MultiSpy.csproj @@ -56,7 +56,7 @@ - + diff --git a/Servers/QuazalServer/Dockerfile b/Servers/QuazalServer/Dockerfile index 1b867a17f..efac7d2d5 100644 --- a/Servers/QuazalServer/Dockerfile +++ b/Servers/QuazalServer/Dockerfile @@ -5,17 +5,23 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -RUN mkdir -p QuazalServer -COPY ["Servers/QuazalServer/", "QuazalServer/"] -RUN dotnet restore "QuazalServer/QuazalServer_docker.csproj" +COPY ["Servers/QuazalServer/QuazalServer.csproj", "Servers/QuazalServer/"] +COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"] +COPY ["AuxiliaryServices/AlcatrazService/AlcatrazService.csproj", "AuxiliaryServices/AlcatrazService/"] +COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"] +COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"] +COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"] +COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"] +COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"] +RUN dotnet restore "Servers/QuazalServer/QuazalServer.csproj" COPY . . -WORKDIR "/src/QuazalServer" -RUN dotnet build "QuazalServer_docker.csproj" -c Release -o /app/build +WORKDIR "/src/Servers/QuazalServer" +RUN dotnet build "QuazalServer.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "QuazalServer_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "QuazalServer.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "QuazalServer_docker.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "QuazalServer.dll"] \ No newline at end of file diff --git a/Servers/QuazalServer/QuazalServer.csproj b/Servers/QuazalServer/QuazalServer.csproj index 98e2ff71b..1ecb6eb8a 100644 --- a/Servers/QuazalServer/QuazalServer.csproj +++ b/Servers/QuazalServer/QuazalServer.csproj @@ -37,7 +37,7 @@ - + diff --git a/Servers/QuazalServer/QuazalServer_docker.csproj b/Servers/QuazalServer/QuazalServer_docker.csproj deleted file mode 100644 index ef9c0011d..000000000 --- a/Servers/QuazalServer/QuazalServer_docker.csproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - Exe - net6.0 - enable - enable - Linux - -p 21032:21032 -p 30160:30160 -p 30161:30161 -p 30200:30200 -p 30201:30201 -p 30550:30550 -p 30560:30560 -p 30561:30561 -p 60001:60001 -p 60105:60105 -p 60106:60106 -p 60115:60115 -p 60116:60116 -p 61110:61110 -p 61111:61111 -p 61120:61120 -p 61121:61121 -p 61125:61125 -p 61126:61126 -p 61127:61127 -p 61128:61128 -p 61129:61129 -p 61130:61130 -p 61131:61131 -p 61132:61132 -p 61133:61133 -p 61134:61134 -p 61135:61135 -p 61136:61136 -p 61137:61137 -p 61138:61138 -p 62110:62110 -p 62111:62111 -p 62125:62125 -p 62126:62126 -p 62127:62127 -p 62128:62128 -p 65535:65535 - QuazalServer.ico - true - ..\.. - - - - - - - - - all - - - - - - - - Always - - - - - - - - - - - - - - diff --git a/Servers/SSFWServer/Dockerfile b/Servers/SSFWServer/Dockerfile index 3e8af1dc4..c5c89c4b9 100644 --- a/Servers/SSFWServer/Dockerfile +++ b/Servers/SSFWServer/Dockerfile @@ -5,16 +5,25 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/SSFWServer/", "SSFWServer/"] -RUN dotnet restore "SSFWServer/SSFWServer_docker.csproj" +COPY ["Servers/SSFWServer/SSFWServer.csproj", "Servers/SSFWServer/"] +COPY ["AuxiliaryServices/HomeTools/HomeTools.csproj", "AuxiliaryServices/HomeTools/"] +COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"] +COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"] +COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"] +COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"] +COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"] +COPY ["AuxiliaryServices/WebAPIService/WebAPIService.csproj", "AuxiliaryServices/WebAPIService/"] +COPY ["BackendServices/NetCoreServer/NetCoreServer.csproj", "BackendServices/NetCoreServer/"] +COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"] +RUN dotnet restore "Servers/SSFWServer/SSFWServer.csproj" COPY . . -WORKDIR "/src/SSFWServer" -RUN dotnet build "SSFWServer_docker.csproj" -c Release -o /app/build +WORKDIR "/src/Servers/SSFWServer" +RUN dotnet build "SSFWServer.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "SSFWServer_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "SSFWServer.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "SSFWServer_docker.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "SSFWServer.dll"] \ No newline at end of file diff --git a/Servers/SSFWServer/SSFWServer.csproj b/Servers/SSFWServer/SSFWServer.csproj index 91bf18782..d41fed2af 100644 --- a/Servers/SSFWServer/SSFWServer.csproj +++ b/Servers/SSFWServer/SSFWServer.csproj @@ -39,7 +39,7 @@ - + diff --git a/Servers/SSFWServer/SSFWServer_docker.csproj b/Servers/SSFWServer/SSFWServer_docker.csproj deleted file mode 100644 index adf3c0303..000000000 --- a/Servers/SSFWServer/SSFWServer_docker.csproj +++ /dev/null @@ -1,45 +0,0 @@ - - - - Exe - net6.0 - enable - enable - Linux - -p 8080:8080 -p 10443:10443 -p 65535:65535 - SSFW.ico - true - ..\.. - - - - - - - - - all - - - - - - - - Always - - - - - - - - - - - - - - - - diff --git a/Servers/SVO/Dockerfile b/Servers/SVO/Dockerfile index 2be94436d..8ec45af22 100644 --- a/Servers/SVO/Dockerfile +++ b/Servers/SVO/Dockerfile @@ -5,16 +5,26 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src -COPY ["Servers/SVO/", "SVO/"] -RUN dotnet restore "SVO/SVO_docker.csproj" +COPY ["Servers/SVO/SVO.csproj", "Servers/SVO/"] +COPY ["AuxiliaryServices/HorizonService/HorizonService.csproj", "AuxiliaryServices/HorizonService/"] +COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"] +COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"] +COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"] +COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"] +COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"] +COPY ["AuxiliaryServices/WebAPIService/WebAPIService.csproj", "AuxiliaryServices/WebAPIService/"] +COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"] +COPY ["BackendServices/WatsonWebserver/WatsonWebserver.csproj", "BackendServices/WatsonWebserver/"] +COPY ["BackendServices/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj", "BackendServices/SpaceWizards.HttpListener/"] +RUN dotnet restore "Servers/SVO/SVO.csproj" COPY . . -WORKDIR "/src/SVO" -RUN dotnet build "SVO_docker.csproj" -c Release -o /app/build +WORKDIR "/src/Servers/SVO" +RUN dotnet build "SVO.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "SVO_docker.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "SVO.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "SVO_docker.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "SVO.dll"] \ No newline at end of file diff --git a/Servers/SVO/SVO.csproj b/Servers/SVO/SVO.csproj index 13d8f9b16..ad0d6ff02 100644 --- a/Servers/SVO/SVO.csproj +++ b/Servers/SVO/SVO.csproj @@ -38,7 +38,7 @@ - + diff --git a/Servers/SVO/SVO_docker.csproj b/Servers/SVO/SVO_docker.csproj deleted file mode 100644 index 80cc62b0c..000000000 --- a/Servers/SVO/SVO_docker.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - Exe - net6.0 - enable - enable - Linux - -p 10058:10058 -p 10060:10060 -p 10061:10061 -p 10062:10062 -p 65535:65535 - SVO.ico - true - ..\.. - - - - - - - - - all - - - - - - - - - - - - - - Always - - - - - - - - -