solr updates

start-solr.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-#sudo docker run --rm -ti -v ~/dev/integreat/data/solr:/var/solr --network=bridge -p 8983:8983 solr
-sudo podman container run --user 1000 --privileged --volume /home/notid/dev/integreat/data/solr:/var/solr -p 8983:8983 docker.io/solr
+sudo docker run --rm -ti -v ~/dev/integreat/data/solr:/var/solr --network=bridge -p 8983:8983 bryce-solr
+#sudo podman container run --user 1000 --privileged --volume /home/notid/dev/integreat/data/solr:/var/solr -p 8983:8983 bryce-solr
 
 

terraform/deploy.tf

@@ -4,6 +4,10 @@ variable "ecs_cluster" {}
 variable "local_namespace" {}
 variable "desired_count" {}
 variable "background_desired_count" {}
+variable "enable_schedules" {
+  type        = bool
+    default     = null
+    }
 
 variable "http_listener_sg" {
 default = "sg-0024906e0e1f78048"
@@ -264,6 +268,7 @@ resource "aws_service_discovery_service" "service" {
 }
 
 module "square_import_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -276,6 +281,7 @@ module "square_import_job" {
 }
 
 module "reconcile_ledger_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -288,6 +294,7 @@ module "reconcile_ledger_job" {
 }
 
 module "current_balance_cache" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -300,6 +307,7 @@ module "current_balance_cache" {
 }
 
 module "yodlee2_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -312,6 +320,7 @@ module "yodlee2_job" {
 }
 
 module "intuit_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -324,6 +333,7 @@ module "intuit_job" {
 }
 
 module "plaid_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -336,6 +346,7 @@ module "plaid_job" {
 }
 
 module "vendor_usages_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -350,6 +361,7 @@ module "vendor_usages_job" {
 
 
 module "import_uploaded_invoices_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -362,6 +374,7 @@ module "import_uploaded_invoices_job" {
 }
 
 module "sysco_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -374,6 +387,7 @@ module "sysco_job" {
 }
 
 module "close_auto_invoices_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -386,6 +400,7 @@ module "close_auto_invoices_job" {
 }
 
 module "yodlee2_accounts_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -399,6 +414,7 @@ module "yodlee2_accounts_job" {
 
 
 module "bulk_journal_import_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -411,6 +427,7 @@ module "bulk_journal_import_job" {
 }
 
 module "register_invoice_import_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -423,6 +440,7 @@ module "register_invoice_import_job" {
 }
 
 module "load_historical_sales_job" {
+       count = var.enable_schedules ? 1 : 0
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
        task_role_arn = var.task_role_arn
@@ -435,6 +453,7 @@ module "load_historical_sales_job" {
 }
 
 module "ntg_job" {
+       count = var.enable_schedules ? 1 : 0
        schedule = "rate(6 hours)"
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster
@@ -448,6 +467,7 @@ module "ntg_job" {
 }
 
 module "insight_outcome_recommendation_job" {
+       count = var.enable_schedules ? 1 : 0
        schedule = "rate(6 hours)"
        source = "./background-job/"
        ecs_cluster = var.ecs_cluster

terraform/prod-solr-taskdef.json

@@ -11,7 +11,7 @@
             }
         ],
         "essential": true,
-        "image": "solr",
+        "image": "679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat-solr",
 	
         "logConfiguration": {
             "logDriver": "awslogs",

terraform/staging-solr-taskdef.json

@@ -11,7 +11,7 @@
             }
         ],
         "essential": true,
-        "image": "solr",
+        "image": "679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat-solr",
 	
         "logConfiguration": {
             "logDriver": "awslogs",

terraform/staging.tfvars

@@ -9,5 +9,6 @@ execution_role_arn="arn:aws:iam::679918342773:role/ecsTaskExecutionRole"
 ecs_cluster="arn:aws:ecs:us-east-1:679918342773:cluster/default"
 # service_registry="arn:aws:servicediscovery:us-east-1:679918342773:service/srv-6auj2wqsh55k2nuj"
 local_namespace="ns-gv2z744em7myo2jp"
-desired_count=0
+desired_count=1
 background_desired_count=0
+enable_schedules=false