mv server code into server sub-dir

docker-compose.agent.tests.yml

@@ -5,7 +5,7 @@ services:
     image: collinbarrett2/filterlists.agent:test-agent
     build:
       context: .
-      dockerfile: src/FilterLists.Agent/Dockerfile
+      dockerfile: server/src/FilterLists.Agent/Dockerfile
       target: test-agent
     networks:
       - test-agent

docker-compose.data.tests.yml

@@ -5,7 +5,7 @@ services:
     image: collinbarrett2/filterlists.api:test-data
     build:
       context: .
-      dockerfile: src/FilterLists.Api/Dockerfile
+      dockerfile: server/src/FilterLists.Api/Dockerfile
       target: test-data
     networks:
       - test-data

docker-compose.dcproj

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" Sdk="Microsoft.Docker.Sdk">
-  <PropertyGroup Label="Globals">
-    <ProjectVersion>2.1</ProjectVersion>
-    <DockerTargetOS>Linux</DockerTargetOS>
-    <ProjectGuid>b94a5bcd-3be3-4fe4-ae48-adcf904a22a4</ProjectGuid>
-    <DockerLaunchAction>LaunchBrowser</DockerLaunchAction>
-    <DockerServiceUrl>{Scheme}://localhost:{ServicePort}</DockerServiceUrl>
-    <DockerServiceName>filterlists</DockerServiceName>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include=".env" />
-    <None Include="docker-compose.agent.tests.yml" />
-    <None Include="docker-compose.yml" />
-    <None Include="docker-compose.override.yml">
-      <DependentUpon>docker-compose.yml</DependentUpon>
-    </None>
-    <None Include="docker-compose.prod.yml">
-      <DependentUpon>docker-compose.yml</DependentUpon>
-    </None>
-    <None Include="docker-compose.data.tests.yml" />
-    <None Include="docker-compose.services.tests.yml" />
-    <None Include=".dockerignore" />
-  </ItemGroup>
-</Project>

docker-compose.services.tests.yml

@@ -5,7 +5,7 @@ services:
     image: collinbarrett2/filterlists.api:test-services
     build:
       context: .
-      dockerfile: src/FilterLists.Api/Dockerfile
+      dockerfile: server/src/FilterLists.Api/Dockerfile
       target: test-services
     networks:
       - test-services

docker-compose.yml

@@ -26,7 +26,7 @@ services:
     restart: always
     build:
       context: .
-      dockerfile: src/FilterLists.Api/Dockerfile
+      dockerfile: server/src/FilterLists.Api/Dockerfile
       target: final
     networks:
       - reverse-proxy
@@ -59,7 +59,7 @@ services:
     image: collinbarrett2/filterlists.agent:latest
     build:
       context: .
-      dockerfile: src/FilterLists.Agent/Dockerfile
+      dockerfile: server/src/FilterLists.Agent/Dockerfile
       target: final
     volumes:
       - archives:/app/archives

server/.dockerignore

@@ -1,38 +1,35 @@
 # From default Visual Studio .NET Core template
+**/.classpath
 **/.dockerignore
 **/.env
 **/.git
 **/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
 **/.vs
 **/.vscode
 **/*.*proj.user
-**/azds.yaml
-**/charts
-**/bin
-**/obj
-**/Dockerfile
-**/Dockerfile.develop
-**/docker-compose.yml
-**/docker-compose.*.yml
 **/*.dbmdl
 **/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
 **/secrets.dev.yaml
 **/values.dev.yaml
-**/.toolstarget
+LICENSE
+README.md
 
 # Other common
 **/.gitattributes
 **/.github
 **/.sln
-**/docker-compose.dcproj
 **/*.DotSettings*
 **/appsettings*.json
-**/node_modules
 **/build
 **/*.md
-LICENSE
-
-# FilterLists custom
-imgs
-ops
-data/TPLSubscriptionAssistant.html

server/.gitignore

@@ -29,6 +29,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+[Ll]ogs/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -126,9 +127,6 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding add-in
-.JustCode
-
 # TeamCity is a build add-in
 _TeamCity*
 
@@ -139,6 +137,9 @@ _TeamCity*
 .axoCover/*
 !.axoCover/settings.json
 
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*[.json, .xml, .info]
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -348,6 +349,5 @@ healthchecksdb
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
 
-# FilterLists Custom Ignores
-appsettings.*.json
-src/FilterLists.Web/wwwroot/dist
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/

server/FilterLists.sln

@@ -3,24 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29326.143
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{75D9CA5B-4092-4015-8984-7C4D5B09F10B}"
-	ProjectSection(SolutionItems) = preProject
-		data\Dependent.json = data\Dependent.json
-		data\FilterList.json = data\FilterList.json
-		data\FilterListLanguage.json = data\FilterListLanguage.json
-		data\FilterListMaintainer.json = data\FilterListMaintainer.json
-		data\FilterListTag.json = data\FilterListTag.json
-		data\Fork.json = data\Fork.json
-		data\Language.json = data\Language.json
-		data\License.json = data\License.json
-		data\Maintainer.json = data\Maintainer.json
-		data\Merge.json = data\Merge.json
-		data\Software.json = data\Software.json
-		data\SoftwareSyntax.json = data\SoftwareSyntax.json
-		data\Syntax.json = data\Syntax.json
-		data\Tag.json = data\Tag.json
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EA11453B-FB14-4F0E-A19B-B8089498F677}"
@@ -39,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Data.Tests", "t
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Services.Tests", "tests\FilterLists.Services.Tests\FilterLists.Services.Tests.csproj", "{0F419F45-EC3F-409B-95A2-F6AEE21E4041}"
 EndProject
-Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{B94A5BCD-3BE3-4FE4-AE48-ADCF904A22A4}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -75,10 +55,6 @@ Global
 		{0F419F45-EC3F-409B-95A2-F6AEE21E4041}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0F419F45-EC3F-409B-95A2-F6AEE21E4041}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0F419F45-EC3F-409B-95A2-F6AEE21E4041}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B94A5BCD-3BE3-4FE4-AE48-ADCF904A22A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B94A5BCD-3BE3-4FE4-AE48-ADCF904A22A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B94A5BCD-3BE3-4FE4-AE48-ADCF904A22A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B94A5BCD-3BE3-4FE4-AE48-ADCF904A22A4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

server/azure-pipelines.agent.yaml

@@ -5,10 +5,10 @@ trigger:
   paths:
     include:
       [
-        "azure-pipelines.agent.yaml",
-        "src/FilterLists.Agent/*",
-        "tests/FilterLists.Agent.Tests/*",
-        ".dockerignore",
+        "server/azure-pipelines.agent.yaml",
+        "server/src/FilterLists.Agent/*",
+        "server/tests/FilterLists.Agent.Tests/*",
+        "server/.dockerignore",
         "docker-compose.yml",
         "docker-compose.prod.yml",
         "docker-compose.agent.tests.yml",
@@ -21,10 +21,10 @@ pr:
   paths:
     include:
       [
-        "azure-pipelines.agent.yaml",
-        "src/FilterLists.Agent/*",
-        "tests/FilterLists.Agent.Tests/*",
-        ".dockerignore",
+        "server/azure-pipelines.agent.yaml",
+        "server/src/FilterLists.Agent/*",
+        "server/tests/FilterLists.Agent.Tests/*",
+        "server/.dockerignore",
         "docker-compose.yml",
         "docker-compose.prod.yml",
         "docker-compose.agent.tests.yml",

server/azure-pipelines.api.yaml

@@ -5,13 +5,13 @@ trigger:
   paths:
     include:
       [
-        "azure-pipelines.api.yaml",
-        "src/FilterLists.Api/*",
-        "src/FilterLists.Services/*",
-        "src/FilterLists.Data/*",
-        "tests/FilterLists.Services.Tests/*",
-        "tests/FilterLists.Data.Tests/*",
-        ".dockerignore",
+        "server/azure-pipelines.api.yaml",
+        "server/src/FilterLists.Api/*",
+        "server/src/FilterLists.Services/*",
+        "server/src/FilterLists.Data/*",
+        "server/tests/FilterLists.Services.Tests/*",
+        "server/tests/FilterLists.Data.Tests/*",
+        "server/.dockerignore",
         "docker-compose.yml",
         "docker-compose.prod.yml",
         "docker-compose.data.tests.yml",
@@ -26,13 +26,13 @@ pr:
   paths:
     include:
       [
-        "azure-pipelines.api.yaml",
-        "src/FilterLists.Api/*",
-        "src/FilterLists.Services/*",
-        "src/FilterLists.Data/*",
-        "tests/FilterLists.Services.Tests/*",
-        "tests/FilterLists.Data.Tests/*",
-        ".dockerignore",
+        "server/azure-pipelines.api.yaml",
+        "server/src/FilterLists.Api/*",
+        "server/src/FilterLists.Services/*",
+        "server/src/FilterLists.Data/*",
+        "server/tests/FilterLists.Services.Tests/*",
+        "server/tests/FilterLists.Data.Tests/*",
+        "server/.dockerignore",
         "docker-compose.yml",
         "docker-compose.prod.yml",
         "docker-compose.data.tests.yml",

server/src/FilterLists.Agent/Dockerfile

@@ -1,5 +1,5 @@
 # Context: .
-# Command: docker build -f src/FilterLists.Agent/Dockerfile .
+# Command: docker build -f server/src/FilterLists.Agent/Dockerfile .
 
 # init base
 FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.0-alpine as base
@@ -11,11 +11,11 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.0-alpine AS build
 
 # restore
 WORKDIR /app/src/FilterLists.Agent
-COPY src/FilterLists.Agent/FilterLists.Agent.csproj .
+COPY server/src/FilterLists.Agent/FilterLists.Agent.csproj .
 RUN dotnet restore
 
 # build
-COPY src/FilterLists.Agent/. .
+COPY server/src/FilterLists.Agent/. .
 RUN dotnet build -c Release -r linux-musl-x64 --no-restore
 
 # init Agent.Tests
@@ -24,11 +24,11 @@ ENTRYPOINT ["dotnet", "test", "--logger:trx"]
 
 # restore Agent.Tests
 WORKDIR /app/tests/FilterLists.Agent.Tests
-COPY tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj .
+COPY server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj .
 RUN dotnet restore
 
 # build Agent.Tests
-COPY tests/FilterLists.Agent.Tests/. .
+COPY server/tests/FilterLists.Agent.Tests/. .
 RUN dotnet build -c Release --no-restore
 
 # publish

server/src/FilterLists.Api/Dockerfile

@@ -1,5 +1,5 @@
 # Context: .
-# Command: docker build -f src/FilterLists.Api/Dockerfile .
+# Command: docker build -f server/src/FilterLists.Api/Dockerfile .
 
 # init base
 FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.0-alpine as base
@@ -13,18 +13,18 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.0-alpine AS build
 
 # restore
 WORKDIR /app/src
-COPY src/FilterLists.Data/FilterLists.Data.csproj FilterLists.Data/
-COPY src/FilterLists.Services/FilterLists.Services.csproj FilterLists.Services/
+COPY server/src/FilterLists.Data/FilterLists.Data.csproj FilterLists.Data/
+COPY server/src/FilterLists.Services/FilterLists.Services.csproj FilterLists.Services/
 WORKDIR /app/src/FilterLists.Api
-COPY src/FilterLists.Api/FilterLists.Api.csproj .
+COPY server/src/FilterLists.Api/FilterLists.Api.csproj .
 RUN dotnet restore
 
 # build
 WORKDIR /app/src
-COPY src/FilterLists.Data/. FilterLists.Data/
-COPY src/FilterLists.Services/. FilterLists.Services/
+COPY server/src/FilterLists.Data/. FilterLists.Data/
+COPY server/src/FilterLists.Services/. FilterLists.Services/
 WORKDIR /app/src/FilterLists.Api
-COPY src/FilterLists.Api/. .
+COPY server/src/FilterLists.Api/. .
 RUN dotnet build -c Release -r linux-musl-x64 --no-restore
 
 # init Data.Tests
@@ -33,11 +33,11 @@ ENTRYPOINT ["dotnet", "test", "--logger:trx"]
 
 # restore Data.Tests
 WORKDIR /app/tests/FilterLists.Data.Tests
-COPY tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj .
+COPY server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj .
 RUN dotnet restore
 
 # build Data.Tests
-COPY tests/FilterLists.Data.Tests/. .
+COPY server/tests/FilterLists.Data.Tests/. .
 RUN dotnet build -c Release --no-restore
 COPY data/. data/
 
@@ -47,11 +47,11 @@ ENTRYPOINT ["dotnet", "test", "--logger:trx"]
 
 # restore Services.Tests
 WORKDIR /app/tests/FilterLists.Services.Tests
-COPY tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj .
+COPY server/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj .
 RUN dotnet restore
 
 # build Services.Tests
-COPY tests/FilterLists.Services.Tests/. .
+COPY server/tests/FilterLists.Services.Tests/. .
 RUN dotnet build -c Release --no-restore
 
 # publish