Update docker-compose with new catalina options

lsst-sqre · Aug 13, 2024 · ed63097 · ed63097
1 parent 83f1d04
commit ed63097
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.d/20240813_174807_steliosvoutsinas_DM_45720.md b/changelog.d/20240813_174807_steliosvoutsinas_DM_45720.md
@@ -0,0 +1,3 @@
+### Fixed
+
+- docker-compose.yml to get updated CATALINA_OPTS required to run local TAP service instance
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     networks:
       - tap-network
     environment:
-      CATALINA_OPTS: "-Dqservuser.username=qsmaster -Dqservuser.password= -Dqservuser.driverClassName=com.mysql.cj.jdbc.Driver -Dqservuser.url=jdbc:mysql://mock-qserv:3306/ -Dtapschemauser.username=TAP_SCHEMA -Dtapschemauser.password=TAP_SCHEMA -Dtapschemauser.driverClassName=com.mysql.cj.jdbc.Driver -Dtapschemauser.url=jdbc:mysql://tap-schema-db:3306/ -Dca.nrc.cadc.reg.client.RegistryClient.local=true -Duws.username=postgres -Duws.driverClassName=org.postgresql.Driver -Duws.url=jdbc:postgresql://uws-db/ -Dca.nrc.cadc.auth.Authenticator=org.opencadc.tap.impl.AuthenticatorImpl -Dca.nrc.cadc.util.PropertiesReader.dir=/etc/creds/"
+      CATALINA_OPTS: "-Dqservuser.username=qsmaster -Dqservuser.password= -Dqservuser.driverClassName=com.mysql.cj.jdbc.Driver -Dqservuser.url=jdbc:mysql://mock-qserv:3306/ -Dqservuser.maxActive=100 -Dtapschemauser.username=TAP_SCHEMA -Dtapschemauser.maxActive=100 -Dtapschemauser.password=TAP_SCHEMA -Dtapschemauser.driverClassName=com.mysql.cj.jdbc.Driver -Dtapschemauser.url=jdbc:mysql://tap-schema-db:3306/ -Duws.username=postgres -Duws.driverClassName=org.postgresql.Driver -Duws.url=jdbc:postgresql://uws-db/ -Dtap.maxActive=100 -Dca.nrc.cadc.util.PropertiesReader.dir=/config/ -Dpath_prefix=/ -Dbase_url=http://localhost/tap -Dtomcat.connector.connectionTimeout=20000 -Dtomcat.connector.keepAliveTimeout=120000 -Dtomcat.connector.secure=false -Dtomcat.connector.scheme=http -Dtomcat.connector.proxyName=localhost -Dtomcat.connector.proxyPort=80 -Dgcs_bucket=async-results.lsst.codes -Dgcs_bucket_url=https://tap-files.lsst.codes -Dgcs_bucket_type=GCS"
       GOOGLE_APPLICATION_CREDENTIALS: "/etc/google_creds.json"
     volumes:
       - './google_creds.json:/etc/google_creds.json'