From 56b1344695452445f41fc5126d06e94585a1be11 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 5 Jul 2020 15:53:47 -0500 Subject: [PATCH] build: extract/disable Agent for now --- docker-compose.override.yml | 6 +-- ...ompose.dcproj => docker-compose.web.dcproj | 0 docker-compose.yml | 44 +++++++++---------- .../{FilterLists.sln => FilterLists.Api.sln} | 28 +++--------- 4 files changed, 32 insertions(+), 46 deletions(-) rename docker-compose.dcproj => docker-compose.web.dcproj (100%) rename server/{FilterLists.sln => FilterLists.Api.sln} (79%) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index c653c7e3b..349ed3ef1 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -11,6 +11,6 @@ services: build: dockerfile: server/src/FilterLists.Api/debug.Dockerfile - agent: - build: - dockerfile: server/src/FilterLists.Agent/debug.Dockerfile +# agent: +# build: +# dockerfile: server/src/FilterLists.Agent/debug.Dockerfile diff --git a/docker-compose.dcproj b/docker-compose.web.dcproj similarity index 100% rename from docker-compose.dcproj rename to docker-compose.web.dcproj diff --git a/docker-compose.yml b/docker-compose.yml index 5fd268720..7cb7eb97e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,27 +56,27 @@ services: "--collation-server=utf8mb4_unicode_520_ci", ] - agent: - image: collinbarrett2/filterlists.agent:latest - build: - context: . - dockerfile: server/src/FilterLists.Agent/Dockerfile - target: final - volumes: - - archives:/app/archives - environment: - ApplicationInsights__InstrumentationKey: ${AGENT_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY} - Archive__RepositoryDirectory: ${AGENT_ARCHIVE_GIT_REPOSITORY_DIRECTORY} - Archive__SignatureName: ${AGENT_ARCHIVE_GIT_SIGNATURE_NAME} - Archive__SignatureEmail: ${AGENT_ARCHIVE_GIT_SIGNATURE_EMAIL} - Archive__CommitMessageSuffix: ${AGENT_ARCHIVE_GIT_COMMIT_MESSAGE_SUFFIX} - ConnectionString__FilterListsConnection: ${API_CONNECTION_STRING} - FilterListsApi__BaseUrl: ${AGENT_FILTERLISTS_API_BASE_URL} - FilterListsApi__ClientUserAgent: ${AGENT_FILTERLISTS_API_CLIENT_USER_AGENT} - GitHub__ProductHeaderValue: ${AGENT_GITHUB_PRODUCT_HEADER_VALUE} - GitHub__PersonalAccessToken: ${AGENT_GITHUB_PERSONAL_ACCESS_TOKEN} - GitHub__RepositoryOwner: ${AGENT_GITHUB_REPOSITORY_OWNER} - GitHub__Repository: ${AGENT_GITHUB_REPOSITORY} +# agent: +# image: collinbarrett2/filterlists.agent:latest +# build: +# context: . +# dockerfile: server/src/FilterLists.Agent/Dockerfile +# target: final +# volumes: +# - archives:/app/archives +# environment: +# ApplicationInsights__InstrumentationKey: ${AGENT_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY} +# Archive__RepositoryDirectory: ${AGENT_ARCHIVE_GIT_REPOSITORY_DIRECTORY} +# Archive__SignatureName: ${AGENT_ARCHIVE_GIT_SIGNATURE_NAME} +# Archive__SignatureEmail: ${AGENT_ARCHIVE_GIT_SIGNATURE_EMAIL} +# Archive__CommitMessageSuffix: ${AGENT_ARCHIVE_GIT_COMMIT_MESSAGE_SUFFIX} +# ConnectionString__FilterListsConnection: ${API_CONNECTION_STRING} +# FilterListsApi__BaseUrl: ${AGENT_FILTERLISTS_API_BASE_URL} +# FilterListsApi__ClientUserAgent: ${AGENT_FILTERLISTS_API_CLIENT_USER_AGENT} +# GitHub__ProductHeaderValue: ${AGENT_GITHUB_PRODUCT_HEADER_VALUE} +# GitHub__PersonalAccessToken: ${AGENT_GITHUB_PERSONAL_ACCESS_TOKEN} +# GitHub__RepositoryOwner: ${AGENT_GITHUB_REPOSITORY_OWNER} +# GitHub__Repository: ${AGENT_GITHUB_REPOSITORY} networks: reverse-proxy: @@ -84,4 +84,4 @@ networks: volumes: data: - archives: +# archives: diff --git a/server/FilterLists.sln b/server/FilterLists.Api.sln similarity index 79% rename from server/FilterLists.sln rename to server/FilterLists.Api.sln index 1c384cfb7..65376ef74 100644 --- a/server/FilterLists.sln +++ b/server/FilterLists.Api.sln @@ -7,23 +7,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{00CBD1AF-455 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EA11453B-FB14-4F0E-A19B-B8089498F677}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Agent", "src\FilterLists.Agent\FilterLists.Agent.csproj", "{BA14A9D0-174C-4944-85E5-DB7D0DCF4D22}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Data", "src\FilterLists.Data\FilterLists.Data.csproj", "{E604D351-D471-41FD-BA82-BAE12B342B4D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data.Migrations", "src\FilterLists.Data.Migrations\FilterLists.Data.Migrations.csproj", "{312A8819-5CAB-4F43-B182-50CAD5D8FEF9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Data.Migrations", "src\FilterLists.Data.Migrations\FilterLists.Data.Migrations.csproj", "{312A8819-5CAB-4F43-B182-50CAD5D8FEF9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Services", "src\FilterLists.Services\FilterLists.Services.csproj", "{51186C58-1627-4743-B86D-4B355D8A152B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Api", "src\FilterLists.Api\FilterLists.Api.csproj", "{1B8105E2-0721-4DC0-8243-02932A05D98B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Agent.Tests", "tests\FilterLists.Agent.Tests\FilterLists.Agent.Tests.csproj", "{668D27A9-FD28-4F2A-BA4C-37BBAED95617}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Data.Tests", "tests\FilterLists.Data.Tests\FilterLists.Data.Tests.csproj", "{EB65E67D-3C29-4555-8D9B-C90801880F51}" 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", "{26883901-339A-44CF-8894-45F6A3A5EBAB}" +Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose.web", "..\docker-compose.web.dcproj", "{26883901-339A-44CF-8894-45F6A3A5EBAB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -31,14 +27,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BA14A9D0-174C-4944-85E5-DB7D0DCF4D22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA14A9D0-174C-4944-85E5-DB7D0DCF4D22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA14A9D0-174C-4944-85E5-DB7D0DCF4D22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA14A9D0-174C-4944-85E5-DB7D0DCF4D22}.Release|Any CPU.Build.0 = Release|Any CPU {E604D351-D471-41FD-BA82-BAE12B342B4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E604D351-D471-41FD-BA82-BAE12B342B4D}.Debug|Any CPU.Build.0 = Debug|Any CPU {E604D351-D471-41FD-BA82-BAE12B342B4D}.Release|Any CPU.ActiveCfg = Release|Any CPU {E604D351-D471-41FD-BA82-BAE12B342B4D}.Release|Any CPU.Build.0 = Release|Any CPU + {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Release|Any CPU.Build.0 = Release|Any CPU {51186C58-1627-4743-B86D-4B355D8A152B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {51186C58-1627-4743-B86D-4B355D8A152B}.Debug|Any CPU.Build.0 = Debug|Any CPU {51186C58-1627-4743-B86D-4B355D8A152B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -47,14 +43,6 @@ Global {1B8105E2-0721-4DC0-8243-02932A05D98B}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B8105E2-0721-4DC0-8243-02932A05D98B}.Release|Any CPU.ActiveCfg = Release|Any CPU {1B8105E2-0721-4DC0-8243-02932A05D98B}.Release|Any CPU.Build.0 = Release|Any CPU - {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {312A8819-5CAB-4F43-B182-50CAD5D8FEF9}.Release|Any CPU.Build.0 = Release|Any CPU - {668D27A9-FD28-4F2A-BA4C-37BBAED95617}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {668D27A9-FD28-4F2A-BA4C-37BBAED95617}.Debug|Any CPU.Build.0 = Debug|Any CPU - {668D27A9-FD28-4F2A-BA4C-37BBAED95617}.Release|Any CPU.ActiveCfg = Release|Any CPU - {668D27A9-FD28-4F2A-BA4C-37BBAED95617}.Release|Any CPU.Build.0 = Release|Any CPU {EB65E67D-3C29-4555-8D9B-C90801880F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EB65E67D-3C29-4555-8D9B-C90801880F51}.Debug|Any CPU.Build.0 = Debug|Any CPU {EB65E67D-3C29-4555-8D9B-C90801880F51}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -72,12 +60,10 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {BA14A9D0-174C-4944-85E5-DB7D0DCF4D22} = {00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F} {E604D351-D471-41FD-BA82-BAE12B342B4D} = {00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F} + {312A8819-5CAB-4F43-B182-50CAD5D8FEF9} = {00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F} {51186C58-1627-4743-B86D-4B355D8A152B} = {00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F} {1B8105E2-0721-4DC0-8243-02932A05D98B} = {00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F} - {312A8819-5CAB-4F43-B182-50CAD5D8FEF9} = {00CBD1AF-455E-4DF5-AB24-A5C2C18EEB6F} - {668D27A9-FD28-4F2A-BA4C-37BBAED95617} = {EA11453B-FB14-4F0E-A19B-B8089498F677} {EB65E67D-3C29-4555-8D9B-C90801880F51} = {EA11453B-FB14-4F0E-A19B-B8089498F677} {0F419F45-EC3F-409B-95A2-F6AEE21E4041} = {EA11453B-FB14-4F0E-A19B-B8089498F677} EndGlobalSection