Merge pull request #160 from adhocteam/cm-204-add-clamav-env-variables

add clam-av to docker-compose and env variables
HHS · Feb 10, 2021 · 5bb9bd9 · 5bb9bd9
2 parents 16c743f + 48e1b1b
commit 5bb9bd9
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 2 deletions.
diff --git a/.env.example b/.env.example
@@ -42,4 +42,8 @@ S3_BUCKET=ttadp-test
 AWS_SECRET_ACCESS_KEY=EXAMPLESECRETKEY
 AWS_ACCESS_KEY_ID=EXAMPLEID
 MINIO_ROOT_PASSWORD=EXAMPLESECRETKEY
-MINIO_ROOT_USER=EXAMPLEID
+MINIO_ROOT_USER=EXAMPLEID
+# if using docker
+CLAMAV_ENDPOINT=http://clamav-rest:8080
+# if running locally
+# CLAMAV_ENDPOINT=http://localhost:8081
diff --git a/deployment_config/dev_vars.yml b/deployment_config/dev_vars.yml
@@ -6,3 +6,4 @@ REDIRECT_URI_HOST: https://tta-smarthub-dev.app.cloud.gov
 rds_instance: ttahub-dev
 s3_doc_upload_bucket: ttahub-document-upload-dev
 TTA_SMART_HUB_URI: https://tta-smarthub-dev.app.cloud.gov
+CLAMAV_ENDPOINT: http://clamapi-ttahub-dev.apps.internal:8080
diff --git a/deployment_config/prod_vars.yml b/deployment_config/prod_vars.yml
@@ -6,3 +6,4 @@ REDIRECT_URI_HOST: https://ttahub.ohs.acf.hhs.gov
 rds_instance: ttahub-prod
 s3_doc_upload_bucket: ttahub-document-upload-prod
 TTA_SMART_HUB_URI: https://ttahub.ohs.acf.hhs.gov
+CLAMAV_ENDPOINT: http://clamapi-ttahub-prod.apps.internal:8080
diff --git a/deployment_config/sandbox_vars.yml b/deployment_config/sandbox_vars.yml
@@ -6,3 +6,4 @@ REDIRECT_URI_HOST: https://tta-smarthub-sandbox.app.cloud.gov
 rds_instance: ttahub-sandbox
 s3_doc_upload_bucket: ttahub-document-upload-sandbox
 TTA_SMART_HUB_URI: https://tta-smarthub-sandbox.app.cloud.gov
+CLAMAV_ENDPOINT: http://clamapi-ttahub-dev.apps.internal:8080
diff --git a/deployment_config/staging_vars.yml b/deployment_config/staging_vars.yml
@@ -6,3 +6,4 @@ REDIRECT_URI_HOST: https://tta-smarthub-staging.app.cloud.gov
 rds_instance: ttahub-staging
 s3_doc_upload_bucket: ttahub-document-upload-staging
 TTA_SMART_HUB_URI: https://tta-smarthub-staging.app.cloud.gov
+CLAMAV_ENDPOINT: http://clamapi-ttahub-dev.apps.internal:8080
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -54,7 +54,14 @@ services:
     image: amazon/aws-cli
     env_file: .env
     command: ["--endpoint-url", "$S3_ENDPOINT", "s3api", "create-bucket", "--bucket", "$S3_BUCKET"]
-
+  clamav-server:
+    image: mkodockx/docker-clamav:alpine
+  clamav-rest:
+    image: lokori/clamav-rest
+    environment:
+      CLAMD_HOST: clamav-server
+    ports:
+      - "8081:8080"
 
 volumes:
   dbdata: {}

diff --git a/manifest.yml b/manifest.yml
@@ -20,6 +20,7 @@ applications:
       HSES_DATA_FILE_URL: ((HSES_DATA_FILE_URL))
       HSES_DATA_USERNAME: ((HSES_DATA_USERNAME))
       HSES_DATA_PASSWORD: ((HSES_DATA_PASSWORD))
+      CLAMAV_ENDPOINT: ((CLAMAV_ENDPOINT))
     services:
       - ((rds_instance))
       - ((s3_doc_upload_bucket))