build: ♻ misc build updates

docker-compose.dcproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <None Include=".env" />
-    <None Include="docker-compose.migrations.tests.yml" />
+    <None Include="docker-compose.directory.migrations.tests.yml" />
     <None Include="docker-compose.override.yml">
       <DependentUpon>docker-compose.yml</DependentUpon>
     </None>

docker-compose.directory.migrations.tests.yml

@@ -1,30 +1,30 @@
 version: "3.8"
 
 services:
-  directory.infrastructure.migrations.tests:
+  directory-migrations-tests:
     build:
       context: ./services
       dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile
-      target: test-migrations
+      target: migrations-tests
     networks:
-      - test-migrations
+      - directory-migrations-tests
     volumes:
-      - test-migrations-results:/app/tests/FilterLists.Infrastructure.Migrations.Tests/TestResults
+      - directory-migrations-tests-results:/app/tests/FilterLists.Infrastructure.Migrations.Tests/TestResults
     depends_on:
-      - directory.db
+      - directory-migrations-tests-db
 
-  directory.db:
+  directory-migrations-tests-db:
     image: postgres:alpine
     networks:
-      - test-migrations
+      - directory-migrations-tests
     environment:
       POSTGRES_USER: ${DIRECTORY_DB_USER}
       POSTGRES_PASSWORD: ${DIRECTORY_DB_PASSWORD}
       POSTGRES_DB: ${DIRECTORY_DB_DATABASE}
 
 networks:
-  test-migrations:
+  directory-migrations-tests:
 
 volumes:
-  test-migrations-results:
+  directory-migrations-tests-results:
     external: true

docker-compose.override.yml

@@ -3,18 +3,18 @@
 version: "3.8"
 
 services:
-  reverse_proxy:
+  reverse-proxy:
     ports:
       - "80:80"
     volumes:
       - ./reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro
     command: ["nginx-debug", "-g", "daemon off;"]
 
-  directory.api:
+  directory-api:
     build:
       dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile.dev
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
 
-  directory.db:
+  directory-db:
     command: ["postgres", "-c", "log_statement=all"]

docker-compose.prod.yml

@@ -3,7 +3,7 @@
 version: "3.8"
 
 services:
-  reverse_proxy:
+  reverse-proxy:
     ports:
       - "443:443"
     depends_on:
@@ -18,6 +18,6 @@ services:
     build:
       context: ./web
     networks:
-      - reverse_proxy
+      - reverse-proxy
     depends_on:
-      - directory.api
+      - directory-api

docker-compose.yml

@@ -1,47 +1,47 @@
 version: "3.8"
 
 services:
-  reverse_proxy:
+  reverse-proxy:
     image: nginx:alpine
     restart: always
     networks:
-      - reverse_proxy
+      - reverse-proxy
     depends_on:
-      - directory.api
+      - directory-api
     volumes:
       - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
 
-  directory.api:
+  directory-api:
     image: filterlists-directory-api
     restart: always
     build:
       context: ./services
       dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile
     networks:
-      - reverse_proxy
+      - reverse-proxy
       - directory
     depends_on:
-      - directory.db
+      - directory-db
     environment:
       ConnectionStrings__DirectoryConnection: ${DIRECTORY_CONNECTION_STRING}
     environment:
       - ASPNETCORE_URLS=http://+:80
 
-  directory.db:
+  directory-db:
     image: postgres:alpine
     restart: always
     networks:
       - directory
     volumes:
-      - directory.db:/var/lib/postgresql/data
+      - directory-db:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: ${DIRECTORY_DB_USER}
       POSTGRES_PASSWORD: ${DIRECTORY_DB_PASSWORD}
       POSTGRES_DB: ${DIRECTORY_DB_DATABASE}
 
 networks:
-  reverse_proxy:
+  reverse-proxy:
   directory:
 
 volumes:
-  directory.db:
+  directory-db:

reverse-proxy/conf.d.dev/filterlists.conf

@@ -3,7 +3,7 @@ server {
 
   location ^~ /api {
     rewrite ^/api/(.*)$ /$1 break;
-    proxy_pass         http://directory.api:80;
+    proxy_pass         http://directory-api:80;
     proxy_http_version 1.1;
     proxy_set_header   Upgrade $http_upgrade;
     proxy_set_header   Connection keep-alive;

reverse-proxy/conf.d/filterlists.conf

@@ -11,7 +11,7 @@ server {
 
   location ^~ /api {
     rewrite ^/api/(.*)$ /$1 break;
-    proxy_pass         http://directory.api:80;
+    proxy_pass         http://directory-api:80;
     proxy_http_version 1.1;
     proxy_set_header   Upgrade $http_upgrade;
     proxy_set_header   Connection keep-alive;

services/directory/azure-pipelines.migrate.yaml

@@ -7,11 +7,7 @@ pr:
   branches:
     include: [master]
   paths:
-    include:
-      [
-        services/directory/data/*,
-        services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/*,
-      ]
+    include: [services/directory/data/*]
 
 pool:
   vmImage: ubuntu-latest