Revert "mv compose agent tests to sub-dir"

This reverts commit a71cf5c582.

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Collin M. Barrett
+Copyright (c) 2018 Collin M. Barrett
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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.override.yml

@@ -6,11 +6,11 @@ services:
       - "80:80"
     volumes:
       - ./ops/nginx/conf.d.dev:/etc/nginx/conf.d:ro
-
+      
   api:
     build:
       dockerfile: server/src/FilterLists.Api/debug.Dockerfile
 
   agent:
     build:
-      dockerfile: src/FilterLists.Agent/debug.Dockerfile
+      dockerfile: server/src/FilterLists.Agent/debug.Dockerfile

docker-compose.yml

@@ -59,8 +59,8 @@ services:
   agent:
     image: collinbarrett2/filterlists.agent:latest
     build:
-      context: ./server
-      dockerfile: src/FilterLists.Agent/Dockerfile
+      context: .
+      dockerfile: server/src/FilterLists.Agent/Dockerfile
       target: final
     volumes:
       - archives:/app/archives

server/azure-pipelines.agent.yaml

@@ -12,7 +12,7 @@ trigger:
         ".dockerignore",
         "docker-compose.yml",
         "docker-compose.prod.yml",
-        "server/docker-compose.agent.tests.yml",
+        "docker-compose.agent.tests.yml",
       ]
 
 pr:
@@ -29,7 +29,7 @@ pr:
         ".dockerignore",
         "docker-compose.yml",
         "docker-compose.prod.yml",
-        "server/docker-compose.agent.tests.yml",
+        "docker-compose.agent.tests.yml",
       ]
 
 pool:
@@ -45,7 +45,7 @@ steps:
   - task: DockerCompose@0
     displayName: "run agent"
     inputs:
-      dockerComposeFile: "server/docker-compose.agent.tests.yml"
+      dockerComposeFile: "docker-compose.agent.tests.yml"
       dockerComposeCommand: "run agent"
 
   - task: Docker@2

server/src/FilterLists.Agent/Dockerfile

@@ -1,5 +1,5 @@
-# Context: ../../
-# Command: docker build -f src/FilterLists.Agent/Dockerfile .
+# Context: .
+# Command: docker build -f server/src/FilterLists.Agent/Dockerfile .
 
 # init base
 FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-alpine as base
@@ -11,11 +11,11 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1-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.Agent/debug.Dockerfile

@@ -1,5 +1,5 @@
-# Context: ../../
-# Command: docker build -f src/FilterLists.Agent/debug.Dockerfile .
+# Context: .
+# Command: docker build -f server/src/FilterLists.Agent/debug.Dockerfile .
 
 # init base debug (for VS)
 FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim AS base