Merge branch 'codebuild' of https://github.com/CDLUC3/merritt-docker …

…into codebuild
CDLUC3 · Jul 25, 2024 · 918ee4f · 918ee4f
2 parents e00b102 + 19e73f7
commit 918ee4f
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 95 deletions.
diff --git a/mrt-inttest-services/merritt-maven/docker-compose.yml b/mrt-inttest-services/merritt-maven/docker-compose.yml
@@ -8,4 +8,4 @@ services:
       dockerfile: Dockerfile
       args:
         ECR_REGISTRY: ${ECR_REGISTRY}
-        JAVA_RELEASE_ARG: ${JAVA_RELEASE:-8}
+        JAVA_RELEASE_ARG: ${JAVA_RELEASE:-8}
diff --git a/mrt-inttest-services/merritt-maven/platforms.yml b/mrt-inttest-services/merritt-maven/platforms.yml
@@ -0,0 +1,7 @@
+version: '3.3'
+services:
+  merritt-maven:
+    build:
+      platforms:
+      - linux/amd64
+      - linux/arm64
diff --git a/mrt-services/audit/mrt-audit b/mrt-services/audit/mrt-audit
diff --git a/mrt-services/docker-compose.yml b/mrt-services/docker-compose.yml
@@ -28,14 +28,7 @@ services:
       SERVICE: ingest
       HOSTNAME: ingest
       LOGLEVEL: info
-      BatchConsumerDaemon: 1
-      BatchReportConsumerDaemon: 1
-      EstimateConsumerDaemon: 1
-      ProvisionConsumerDaemon: 1
-      DownloadConsumerDaemon: 1
-      ProcessConsumerDaemon: 1
-      RecordConsumerDaemon: 1
-      NotifyConsumerDaemon: 1
+      CATALINA_OPTS: "-DBatchConsumerDaemon=-1 -DBatchReportConsumerDaemon=-1 -DEstimateConsumerDaemon=1 -DProvisionConsumerDaemon=1 -DDownloadConsumerDaemon=1 -DProcessConsumerDaemon=1 -DRecordConsumerDaemon=1 -DNotifyConsumerDaemon=1"
     networks:
       merrittnet:
     ports:
@@ -73,6 +66,7 @@ services:
       SERVICE: store
       HOSTNAME: store
       LOGLEVEL: info
+      CATALINA_OPTS: "-DAccessDaemon=1"
     networks:
       merrittnet:
         aliases:

diff --git a/mrt-services/ingest/mrt-ingest b/mrt-services/ingest/mrt-ingest
diff --git a/mrt-services/inventory/mrt-inventory b/mrt-services/inventory/mrt-inventory
diff --git a/mrt-services/replic/mrt-replic b/mrt-services/replic/mrt-replic
diff --git a/mrt-services/store/mrt-store b/mrt-services/store/mrt-store
diff --git a/mrt-services/ui/.dockerignore b/mrt-services/ui/.dockerignore
diff --git a/mrt-services/ui/Dockerfile b/mrt-services/ui/Dockerfile
diff --git a/mrt-services/ui/ldap-ca.crt b/mrt-services/ui/ldap-ca.crt