From b7964dc26b6ce907cba8b00645855afb53f072d6 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 5 Jul 2020 17:16:39 -0500 Subject: [PATCH] Partial Revert "build: extract/disable Agent for now" This reverts commit 56b1344695452445f41fc5126d06e94585a1be11. --- docker-compose.override.yml | 6 ++--- docker-compose.yml | 44 ++++++++++++++++++------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 349ed3ef1..c653c7e3b 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.yml b/docker-compose.yml index 1494e868c..3f6490845 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: