From 1cfc7b8ce405d6cfbc721ca6410b5ad9b90c507b Mon Sep 17 00:00:00 2001
From: Roland Stens <roland.stens@gmail.com>
Date: Thu, 1 Apr 2021 14:07:39 -0700
Subject: [PATCH] Additions to Makefile and docker-compose so you can run
 clamav locally during test (#195)

---
 .github/workflows/jira-lint.yml |  2 +-
 Makefile                        | 12 ++++++------
 docker-compose.yml              |  7 +++++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/jira-lint.yml b/.github/workflows/jira-lint.yml
index e076afd550..bf9eafb453 100644
--- a/.github/workflows/jira-lint.yml
+++ b/.github/workflows/jira-lint.yml
@@ -13,5 +13,5 @@ jobs:
           jira-base-url: ${{ secrets.JIRA_BASE_URL }}
           skip-branches: '^(prod|test\/v\d+)$'
           skip-comments: false
-          pr-threshold: 500
+          pr-threshold: 2000
           validate_issue_status: true
diff --git a/Makefile b/Makefile
index 44019d5fa5..7ae199ee7a 100644
--- a/Makefile
+++ b/Makefile
@@ -91,19 +91,19 @@ build-backend: ## Builds all backend containers
 	@echo "==============================================="
 	@echo "Make: build-backend - building backend images"
 	@echo "==============================================="
-	@docker-compose -f docker-compose.yml build db db_setup api nginx
+	@docker-compose -f docker-compose.yml build db db_setup api nginx clamav
 
 run-backend: ## Runs all backend containers
 	@echo "==============================================="
 	@echo "Make: run-backend - running backend images"
 	@echo "==============================================="
-	@docker-compose -f docker-compose.yml up -d db db_setup api nginx
+	@docker-compose -f docker-compose.yml up -d db db_setup api nginx clamav
 
 run-backend-debug: ## Runs all backend containers in debug mode, where all container output is printed to the console
 	@echo "==============================================="
 	@echo "Make: run-backend-debug - running backend images in debug mode"
 	@echo "==============================================="
-	@docker-compose -f docker-compose.yml up db db_setup api nginx
+	@docker-compose -f docker-compose.yml up db db_setup api nginx clamav
 
 ## ------------------------------------------------------------------------------
 ## Build/Run Backend+Web Commands (backend + web frontend)
@@ -114,19 +114,19 @@ build-web: ## Builds all backend+web containers
 	@echo "==============================================="
 	@echo "Make: build-web - building web images"
 	@echo "==============================================="
-	@docker-compose -f docker-compose.yml build db db_setup api nginx app
+	@docker-compose -f docker-compose.yml build db db_setup api nginx app clamav
 
 run-web: ## Runs all backend+web containers
 	@echo "==============================================="
 	@echo "Make: run-web - running web images"
 	@echo "==============================================="
-	@docker-compose -f docker-compose.yml up -d db db_setup api nginx app
+	@docker-compose -f docker-compose.yml up -d db db_setup api nginx app clamav
 
 run-web-debug: ## Runs all backend+web containers in debug mode, where all container output is printed to the console
 	@echo "==============================================="
 	@echo "Make: run-web-debug - running web images in debug mode"
 	@echo "==============================================="
-	@docker-compose -f docker-compose.yml up db db_setup api nginx app
+	@docker-compose -f docker-compose.yml up db db_setup api nginx app clamav
 
 ## ------------------------------------------------------------------------------
 ## Build/Run Backend+Ionic Commands (backend + ionic frontend)
diff --git a/docker-compose.yml b/docker-compose.yml
index 48e70307a6..8002a269ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -75,6 +75,13 @@ services:
     depends_on:
       - api
 
+  # Build the clamav docker image
+  clamav:
+    image: mkodockx/docker-clamav:latest
+    container_name: clamav
+    ports:
+      - 3310:3310
+
   ## Build the app docker image
   app:
     image: ${DOCKER_PROJECT_NAME}-app-${DOCKER_NAMESPACE}-img