From 5c17cc415bec72686219b0fdd2ae70ce037aa4dd Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 4 Oct 2020 10:26:46 -0500 Subject: [PATCH] =?UTF-8?q?refactor(docker-compose):=20=E2=99=BB=20extract?= =?UTF-8?q?=20docker-compose=20dir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env => docker-compose/.env | 0 api-docs.env => docker-compose/api-docs.env | 0 .../archival-api.env | 0 .../directory-api.env | 0 .../directory-db.env | 0 .../docker-compose.dcproj | 0 ...ker-compose.directory.migrations.tests.yml | 2 +- .../docker-compose.override.yml | 6 ++-- .../docker-compose.prod.build.yml | 6 ++-- .../docker-compose.prod.yml | 2 +- .../docker-compose.yml | 2 +- reverse-proxy/azure-pipelines.yaml | 11 ++++++-- services/Archival/azure-pipelines.api.yaml | 24 ++++++++-------- services/Directory/azure-pipelines.api.yaml | 28 +++++++++---------- services/FilterLists.sln | 2 +- services/azure-pipelines.api-docs.yaml | 10 +++++-- web/azure-pipelines.yaml | 18 +++++++++--- 17 files changed, 65 insertions(+), 46 deletions(-) rename .env => docker-compose/.env (100%) rename api-docs.env => docker-compose/api-docs.env (100%) rename archival-api.env => docker-compose/archival-api.env (100%) rename directory-api.env => docker-compose/directory-api.env (100%) rename directory-db.env => docker-compose/directory-db.env (100%) rename docker-compose.dcproj => docker-compose/docker-compose.dcproj (100%) rename docker-compose.directory.migrations.tests.yml => docker-compose/docker-compose.directory.migrations.tests.yml (95%) rename docker-compose.override.yml => docker-compose/docker-compose.override.yml (83%) rename docker-compose.prod.build.yml => docker-compose/docker-compose.prod.build.yml (80%) rename docker-compose.prod.yml => docker-compose/docker-compose.prod.yml (86%) rename docker-compose.yml => docker-compose/docker-compose.yml (97%) diff --git a/.env b/docker-compose/.env similarity index 100% rename from .env rename to docker-compose/.env diff --git a/api-docs.env b/docker-compose/api-docs.env similarity index 100% rename from api-docs.env rename to docker-compose/api-docs.env diff --git a/archival-api.env b/docker-compose/archival-api.env similarity index 100% rename from archival-api.env rename to docker-compose/archival-api.env diff --git a/directory-api.env b/docker-compose/directory-api.env similarity index 100% rename from directory-api.env rename to docker-compose/directory-api.env diff --git a/directory-db.env b/docker-compose/directory-db.env similarity index 100% rename from directory-db.env rename to docker-compose/directory-db.env diff --git a/docker-compose.dcproj b/docker-compose/docker-compose.dcproj similarity index 100% rename from docker-compose.dcproj rename to docker-compose/docker-compose.dcproj diff --git a/docker-compose.directory.migrations.tests.yml b/docker-compose/docker-compose.directory.migrations.tests.yml similarity index 95% rename from docker-compose.directory.migrations.tests.yml rename to docker-compose/docker-compose.directory.migrations.tests.yml index 69449e5f9..5202db7f0 100644 --- a/docker-compose.directory.migrations.tests.yml +++ b/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: diff --git a/docker-compose.override.yml b/docker-compose/docker-compose.override.yml similarity index 83% rename from docker-compose.override.yml rename to docker-compose/docker-compose.override.yml index e8f3349cc..149a19702 100644 --- a/docker-compose.override.yml +++ b/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 diff --git a/docker-compose.prod.build.yml b/docker-compose/docker-compose.prod.build.yml similarity index 80% rename from docker-compose.prod.build.yml rename to docker-compose/docker-compose.prod.build.yml index 0091c58c3..e407ca655 100644 --- a/docker-compose.prod.build.yml +++ b/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 diff --git a/docker-compose.prod.yml b/docker-compose/docker-compose.prod.yml similarity index 86% rename from docker-compose.prod.yml rename to docker-compose/docker-compose.prod.yml index ff960b58b..a6afa548a 100644 --- a/docker-compose.prod.yml +++ b/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: diff --git a/docker-compose.yml b/docker-compose/docker-compose.yml similarity index 97% rename from docker-compose.yml rename to docker-compose/docker-compose.yml index 5018e14d4..025ddd7df 100644 --- a/docker-compose.yml +++ b/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 diff --git a/reverse-proxy/azure-pipelines.yaml b/reverse-proxy/azure-pipelines.yaml index 6db71fba0..2e59e50b8 100644 --- a/reverse-proxy/azure-pipelines.yaml +++ b/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 diff --git a/services/Archival/azure-pipelines.api.yaml b/services/Archival/azure-pipelines.api.yaml index b3b98ab2f..6e0c51807 100644 --- a/services/Archival/azure-pipelines.api.yaml +++ b/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 diff --git a/services/Directory/azure-pipelines.api.yaml b/services/Directory/azure-pipelines.api.yaml index 36d3486a7..549eb153e 100644 --- a/services/Directory/azure-pipelines.api.yaml +++ b/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 diff --git a/services/FilterLists.sln b/services/FilterLists.sln index 6e0e7d9d5..5755521f6 100644 --- a/services/FilterLists.sln +++ b/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 diff --git a/services/azure-pipelines.api-docs.yaml b/services/azure-pipelines.api-docs.yaml index 07a568c52..8f2c8ba52 100644 --- a/services/azure-pipelines.api-docs.yaml +++ b/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 diff --git a/web/azure-pipelines.yaml b/web/azure-pipelines.yaml index a7cb178a9..fea93deb9 100644 --- a/web/azure-pipelines.yaml +++ b/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