refactor(docker-compose): ♻ extract docker-compose dir

docker-compose/docker-compose.directory.migrations.tests.yml

@@ -5,7 +5,7 @@ version: "3.7"
 services:
   directory-migrations-tests:
     build:
-      context: ./services
+      context: ../services
       dockerfile: Directory/FilterLists.Directory.Api/migrate.Dockerfile
       target: test-migrations
     volumes:

docker-compose/docker-compose.override.yml

@@ -7,19 +7,19 @@ services:
     ports:
       - "8080:80"
     volumes:
-      - ./reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro
+      - ../reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro
     command: ["nginx-debug", "-g", "daemon off;"]
 
   archival-api:
     build:
-      context: ./services
+      context: ../services
       dockerfile: Archival/FilterLists.Archival.Api/dev.Dockerfile
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
 
   directory-api:
     build:
-      context: ./services
+      context: ../services
       dockerfile: Directory/FilterLists.Directory.Api/dev.Dockerfile
     environment:
       - ASPNETCORE_ENVIRONMENT=Development

docker-compose/docker-compose.prod.build.yml

@@ -6,14 +6,14 @@ version: "3.7"
 services:
   archival-api:
     build:
-      context: ./services
+      context: ../services
       dockerfile: Archival/FilterLists.Archival.Api/Dockerfile
 
   directory-api:
     build:
-      context: ./services
+      context: ../services
       dockerfile: Directory/FilterLists.Directory.Api/Dockerfile
 
   web:
     build:
-      context: ./web
+      context: ../web

docker-compose/docker-compose.prod.yml

@@ -9,7 +9,7 @@ services:
     depends_on:
       - web
     volumes:
-      - ./reverse-proxy/conf.d:/etc/nginx/conf.d:ro
+      - ../reverse-proxy/conf.d:/etc/nginx/conf.d:ro
       - ~/cert:/etc/nginx/cert:ro
 
   web:

docker-compose/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     depends_on:
       - directory-api
     volumes:
-      - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
+      - ../reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
 
   api-docs:
     image: swaggerapi/swagger-ui:latest

reverse-proxy/azure-pipelines.yaml

@@ -3,7 +3,12 @@ trigger:
   branches:
     include: [master]
   paths:
-    include: [reverse-proxy/*, docker-compose.yml, docker-compose.prod.yml]
+    include:
+      [
+        reverse-proxy/*,
+        docker-compose/docker-compose.yml,
+        docker-compose/docker-compose.prod.yml
+      ]
 
 pr: none
 
@@ -21,8 +26,8 @@ steps:
       Contents: |
         reverse-proxy/svr-includes/*
         reverse-proxy/conf.d/*
-        docker-compose.yml
-        docker-compose.prod.yml
+        docker-compose/docker-compose.yml
+        docker-compose/docker-compose.prod.yml
       TargetFolder: $(Build.ArtifactStagingDirectory)
       CleanTargetFolder: true
       OverWrite: true

services/Archival/azure-pipelines.api.yaml

@@ -12,11 +12,11 @@ trigger:
         services/Archival/FilterLists.Archival.Infrastructure/*,
         services/Archival/FilterLists.Archival.Application/*,
         services/Archival/FilterLists.Archival.Api/*,
-        docker-compose.yml,
-        docker-compose.prod.yml,
-        .env,
-        archival-api.env,
-        .dockerignore,
+        services/.dockerignore,
+        docker-compose/docker-compose.yml,
+        docker-compose/docker-compose.prod.yml,
+        docker-compose/.env,
+        docker-compose/archival-api.env        
       ]
 
 pr:
@@ -33,11 +33,11 @@ pr:
         services/Archival/FilterLists.Archival.Infrastructure/*,
         services/Archival/FilterLists.Archival.Application/*,
         services/Archival/FilterLists.Archival.Api/*,
-        docker-compose.yml,
-        docker-compose.prod.yml,
-        .env,
-        archival-api.env,
-        .dockerignore,
+        services/.dockerignore,
+        docker-compose/docker-compose.yml,
+        docker-compose/docker-compose.prod.yml,
+        docker-compose/.env,
+        docker-compose/archival-api.env        
       ]
 
 pool:
@@ -80,8 +80,8 @@ steps:
     inputs:
       SourceFolder: $(Build.SourcesDirectory)
       Contents: |
-        docker-compose.yml
-        docker-compose.prod.yml
+        docker-compose/docker-compose.yml
+        docker-compose/docker-compose.prod.yml
       TargetFolder: $(Build.ArtifactStagingDirectory)
       CleanTargetFolder: true
       OverWrite: true

services/Directory/azure-pipelines.api.yaml

@@ -12,12 +12,12 @@ trigger:
         services/Directory/FilterLists.Directory.Api.Contracts/*,
         services/Directory/FilterLists.Directory.Application/*,        
         services/Directory/FilterLists.Directory.Api/*,
-        docker-compose.yml,
-        docker-compose.prod.yml,
-        .env,
-        directory-db.env,
-        directory-api.env,
-        .dockerignore,
+        services/.dockerignore,
+        docker-compose/docker-compose.yml,
+        docker-compose/docker-compose.prod.yml,
+        docker-compose/.env,
+        docker-compose/directory-db.env,
+        docker-compose/directory-api.env        
       ]
 
 pr:
@@ -34,12 +34,12 @@ pr:
         services/Directory/FilterLists.Directory.Api.Contracts/*,
         services/Directory/FilterLists.Directory.Application/*,        
         services/Directory/FilterLists.Directory.Api/*,
-        docker-compose.yml,
-        docker-compose.prod.yml,
-        .env,
-        directory-db.env,
-        directory-api.env,
-        .dockerignore,
+        services/.dockerignore,
+        docker-compose/docker-compose.yml,
+        docker-compose/docker-compose.prod.yml,
+        docker-compose/.env,
+        docker-compose/directory-db.env,
+        docker-compose/directory-api.env        
       ]
 
 pool:
@@ -82,8 +82,8 @@ steps:
     inputs:
       SourceFolder: $(Build.SourcesDirectory)
       Contents: |
-        docker-compose.yml
-        docker-compose.prod.yml
+        docker-compose/docker-compose.yml
+        docker-compose/docker-compose.prod.yml
       TargetFolder: $(Build.ArtifactStagingDirectory)
       CleanTargetFolder: true
       OverWrite: true

services/FilterLists.sln

@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infra
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure.Migrations", "Directory\FilterLists.Directory.Infrastructure.Migrations\FilterLists.Directory.Infrastructure.Migrations.csproj", "{4F7D51FE-A1F3-4473-A8C3-D57EBDD8E60E}"
 EndProject
-Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "..\docker-compose.dcproj", "{8F04C802-830B-4B6D-8D53-5D2A87B4223D}"
+Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "..\docker-compose\docker-compose.dcproj", "{8F04C802-830B-4B6D-8D53-5D2A87B4223D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A534ED99-43A6-4CD2-9288-BD35F82F4E88}"
 	ProjectSection(SolutionItems) = preProject

services/azure-pipelines.api-docs.yaml

@@ -3,7 +3,11 @@ trigger:
   branches:
     include: [master]
   paths:
-    include: [docker-compose.yml, docker-compose.prod.yml]
+    include:
+      [
+        docker-compose/docker-compose.yml,
+        docker-compose/docker-compose.prod.yml
+      ]
 
 pr: none
 
@@ -19,8 +23,8 @@ steps:
     inputs:
       SourceFolder: $(Build.SourcesDirectory)
       Contents: |
-        docker-compose.yml
-        docker-compose.prod.yml
+        docker-compose/docker-compose.yml
+        docker-compose/docker-compose.prod.yml
       TargetFolder: $(Build.ArtifactStagingDirectory)
       CleanTargetFolder: true
       OverWrite: true

web/azure-pipelines.yaml

@@ -3,14 +3,24 @@ trigger:
   branches:
     include: [master]
   paths:
-    include: [web/*, docker-compose.yml, docker-compose.prod.yml, .dockerignore]
+    include:
+      [
+        web/*,
+        docker-compose/docker-compose.yml,
+        docker-compose/docker-compose.prod.yml
+      ]
 
 pr:
   autoCancel: false
   branches:
     include: [master]
   paths:
-    include: [web/*, docker-compose.yml, docker-compose.prod.yml, .dockerignore]
+    include:
+      [
+        web/*,
+        docker-compose/docker-compose.yml,
+        docker-compose/docker-compose.prod.yml
+      ]
 
 pool:
   vmImage: ubuntu-latest
@@ -52,8 +62,8 @@ steps:
     inputs:
       SourceFolder: $(Build.SourcesDirectory)
       Contents: |
-        docker-compose.yml
-        docker-compose.prod.yml
+        docker-compose/docker-compose.yml
+        docker-compose/docker-compose.prod.yml
       TargetFolder: $(Build.ArtifactStagingDirectory)
       CleanTargetFolder: true
       OverWrite: true