Mercurial > public > ssdt-docker

changeset 142:923c2b21fac7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
flow: Merged <hotfix> 'v1.1.1' to <develop> ('default').
author smith@nwoca.org
date Fri, 16 Jun 2017 17:14:16 +0100
parents 72f15ffc9ad2 (current diff) 9aabd0f7d165 (diff)
children c029be781d13
files
diffstat 3 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon May 15 23:07:10 2017 +0100
+++ b/.hgtags	Fri Jun 16 17:14:16 2017 +0100
@@ -1,1 +1,2 @@
 63cb9be89a26ba4a69e6bd39a2ba2ee550435f92 v1.0.0
+60bb94387b7dfc56227da60f4b530c4e30a4a985 v1.1.0
--- a/compose/preview/import-usas.yml	Mon May 15 23:07:10 2017 +0100
+++ b/compose/preview/import-usas.yml	Fri Jun 16 17:14:16 2017 +0100
@@ -1,9 +1,16 @@
 usasimport:
   image: docker.ssdt.io/usas-import:preview
+  entrypoint: 
+    - java
+    - -Xmx1600m
+    - -XX:MaxMetaspaceSize=256m
+    - -jar
+    - /opt/import/usas-import.jar
   command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH}
   links:
     - usasdb:database
   environment:
+    - DB_POOL_LEAKDETECTIONTHRESHOLD=0
     - DB_HOST=database
     - DB_NAME=$${DATABASE_ENV_DB_NAME}
     - DB_USER=$${DATABASE_ENV_DB_USER}
--- a/compose/preview/import-usps.yml	Mon May 15 23:07:10 2017 +0100
+++ b/compose/preview/import-usps.yml	Fri Jun 16 17:14:16 2017 +0100
@@ -4,6 +4,7 @@
   links:
     - uspsdb:database
   environment:
+    - DB_POOL_LEAKDETECTIONTHRESHOLD=0
     - DB_HOST=database
     - DB_NAME=$${DATABASE_ENV_DB_NAME}
     - DB_USER=$${DATABASE_ENV_DB_USER}