Fixes #33 - updated custom properties to include more configuration v…

…ariables (#34)
ncsa · Sep 30, 2024 · 0dea50b · 0dea50b
1 parent 2f1536b
commit 0dea50b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,11 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - User information to environment of process running the tool [#28](https://github.com/ncsa/datawolf/issues/28)
 
-
 ### Changed
 - IN-CORE Dataset DAO and FileStorage implementation to use latest API [#29](https://github.com/ncsa/datawolf/issues/29)
 - Kubernetes executor prints exception [#23](https://github.com/ncsa/datawolf/issues/23)
 - Upgrade hsqldb to 2.7.3 [#27](https://github.com/ncsa/datawolf/issues/27)
+- Custom properties to include more configuration variables [#33](https://github.com/ncsa/datawolf/issues/33)
 
 ## [4.6.0] - 2023-02-15
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,6 +26,11 @@ services:
       - ENGINE_PAGESIZE=${ENGINE_PAGESIZE:-250}
       - EXECUTOR_DEBUG=${EXECUTOR_DEBUG:-false}
       - DATASET_PERMISSIONS=${DATASET_PERMISSIONS:-private}
+      - DATASET_DAO=${DATASET_DAO:-edu.illinois.ncsa.jpa.dao.DatasetJPADao}
+      - FILE_STORAGE=${FILE_STORAGE:-edu.illinois.ncsa.domain.impl.FileStorageDisk}
+      - INCORE_USER=${INCORE_USER:-incrtst}
+      - INCORE_GROUP=${INCORE_GROUP:-incore_user}
+      - INCORE_SERVER=${INCORE_SERVER:-http://localhost:8080}
       - LOG=${LOG}
     ports:
       - 8888:8888

diff --git a/docker/custom.properties b/docker/custom.properties
@@ -1,5 +1,8 @@
+
+# Initial accounts for administrator(s)
 initialAdmins=${DATAWOLF_ADMINS}
 
+# Database configuration
 hibernate.hikari.dataSourceClassName=${DB_CLASS_NAME}
 hibernate.dialect=${DB_DIALECT}
 hibernate.hikari.dataSource.url=${DB_SOURCE_URL}
@@ -8,18 +11,31 @@ hibernate.hikari.idleTimeout=${DB_IDLE_TIMEOUT}
 hibernate.hikari.dataSource.user=${DB_USER}
 hibernate.hikari.dataSource.password=${DB_PASSWORD}
 
+# Engine configuration
 engine.storeLogs=${ENGINE_STORELOGS}
 engine.timeout=${ENGINE_TIMEOUT}
 engine.extraLocalExecutor=${ENGINE_EXTRALOCALEXECUTOR}
 engine.localExecutorThreads=${ENGINE_LOCALEXECUTORTHREADS}
 engine.pageSize=${ENGINE_PAGESIZE}
+executor.debug=${EXECUTOR_DEBUG}
 
+#Kubernetes configuration
 kubernetes.namespace=${KUBERNETES_NAMESPACE}
 kubernetes.pvc=${KUBERNETES_PVC}
 kubernetes.data=${KUBERNETES_DATA}
 kubernetes.cpu=${KUBERNETES_CPU}
 kubernetes.memory=${KUBERNETES_MEMORY}
 
-executor.debug=${EXECUTOR_DEBUG}
+# DAO Configurations
+dataset.dao=${DATASET_DAO}
+
+# File storage configuration
+filestorage=${FILE_STORAGE}
+
+# IN-CORE specific configuration
+incore.server=${INCORE_SERVER}
+incore.group=${INCORE_GROUP}
+incore.user=${INCORE_USER}
 
+# Dataset permissions
 dataset.permissions=${DATASET_PERMISSIONS}