This is an automated email from the ASF dual-hosted git repository.
lahirujayathilake pushed a commit to branch agent-framewok-refactoring
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/agent-framewok-refactoring by
this push:
new 1eb3e010e9 updated the config files
1eb3e010e9 is described below
commit 1eb3e010e9d23406cda45f6a0872a14d7eb1ec8f
Author: lahiruj <[email protected]>
AuthorDate: Wed Dec 18 01:21:54 2024 -0500
updated the config files
---
.../deployment/jupyterhub/user-container/MD/Dockerfile | 14 +++++++++++---
.../user-container/MD/data/{pull.conf => pull_cpu.conf} | 2 +-
.../user-container/MD/data/{pull.conf => pull_gpu.conf} | 0
.../jupyterhub/user-container/MD/data/sample.txt | 1 +
dev-tools/deployment/jupyterhub/user-container/MD/init.sh | 15 +++++++++++++++
.../deployment/jupyterhub/user-container/MD/settings.ini | 2 +-
.../connection/service/controllers/PlanController.java | 2 +-
7 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/dev-tools/deployment/jupyterhub/user-container/MD/Dockerfile
b/dev-tools/deployment/jupyterhub/user-container/MD/Dockerfile
index 9491b80f2e..47739f6453 100644
--- a/dev-tools/deployment/jupyterhub/user-container/MD/Dockerfile
+++ b/dev-tools/deployment/jupyterhub/user-container/MD/Dockerfile
@@ -1,6 +1,14 @@
FROM jupyter/base-notebook:latest
-COPY data /home/jovyan/data/
-COPY poc.ipynb settings.ini /home/jovyan/
+COPY data /tmp/default_data/
+COPY poc.ipynb settings.ini /tmp/default_configs/
-RUN chown -R jovyan:users /home/jovyan/data /home/jovyan/settings.ini
\ No newline at end of file
+COPY init.sh /usr/local/bin/init.sh
+
+USER root
+RUN chmod +x /usr/local/bin/init.sh
+
+USER $NB_USER
+
+ENTRYPOINT ["/usr/local/bin/init.sh"]
+CMD ["start-notebook.sh"]
\ No newline at end of file
diff --git a/dev-tools/deployment/jupyterhub/user-container/MD/data/pull.conf
b/dev-tools/deployment/jupyterhub/user-container/MD/data/pull_cpu.conf
similarity index 98%
copy from dev-tools/deployment/jupyterhub/user-container/MD/data/pull.conf
copy to dev-tools/deployment/jupyterhub/user-container/MD/data/pull_cpu.conf
index 745b31b0bf..82893950df 100644
--- a/dev-tools/deployment/jupyterhub/user-container/MD/data/pull.conf
+++ b/dev-tools/deployment/jupyterhub/user-container/MD/data/pull_cpu.conf
@@ -94,7 +94,7 @@ cutoff 12.0
switching on
switchdist 10.0
-CUDASOAintegrate on
+#CUDASOAintegrate on
#script
run 3000
diff --git a/dev-tools/deployment/jupyterhub/user-container/MD/data/pull.conf
b/dev-tools/deployment/jupyterhub/user-container/MD/data/pull_gpu.conf
similarity index 100%
rename from dev-tools/deployment/jupyterhub/user-container/MD/data/pull.conf
rename to dev-tools/deployment/jupyterhub/user-container/MD/data/pull_gpu.conf
diff --git a/dev-tools/deployment/jupyterhub/user-container/MD/data/sample.txt
b/dev-tools/deployment/jupyterhub/user-container/MD/data/sample.txt
new file mode 100644
index 0000000000..47304cca57
--- /dev/null
+++ b/dev-tools/deployment/jupyterhub/user-container/MD/data/sample.txt
@@ -0,0 +1 @@
+hello from the sample file!
\ No newline at end of file
diff --git a/dev-tools/deployment/jupyterhub/user-container/MD/init.sh
b/dev-tools/deployment/jupyterhub/user-container/MD/init.sh
new file mode 100755
index 0000000000..2f828abbf7
--- /dev/null
+++ b/dev-tools/deployment/jupyterhub/user-container/MD/init.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+TARGET_DIR="/home/jovyan/work"
+
+if [ -z "$(ls -A $TARGET_DIR)" ]; then
+ echo "Initializing user environment with default files..."
+ cp -r /tmp/default_data "$TARGET_DIR/data"
+ cp /tmp/default_configs/poc.ipynb "$TARGET_DIR/"
+ cp /tmp/default_configs/settings.ini "$TARGET_DIR/"
+ chown -R jovyan:users "$TARGET_DIR"
+else
+ echo "User environment already initialized."
+fi
+
+exec "$@"
diff --git a/dev-tools/deployment/jupyterhub/user-container/MD/settings.ini
b/dev-tools/deployment/jupyterhub/user-container/MD/settings.ini
index afa10efda6..c4cc453ba4 100644
--- a/dev-tools/deployment/jupyterhub/user-container/MD/settings.ini
+++ b/dev-tools/deployment/jupyterhub/user-container/MD/settings.ini
@@ -8,7 +8,7 @@ FILEMGR_SVC_URL = http://3.142.234.94:8050
[Gateway]
GATEWAY_ID = default
GATEWAY_URL = gateway.cybershuttle.org
-GATEWAY_DATA_STORE_DIR = /var/www/portals/gateway-user-data/iguide-cybershuttle
+GATEWAY_DATA_STORE_DIR = /var/www/portals/gateway-user-data/cybershuttle
STORAGE_RESOURCE_HOST =
iguide-cybershuttle.che070035.projects.jetstream-cloud.org
SFTP_PORT = 9000
diff --git
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java
index b24f6a667d..8ef14e8ffc 100644
---
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java
+++
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/controllers/PlanController.java
@@ -68,7 +68,7 @@ public class PlanController {
}
@PutMapping("/{planId}")
- public ResponseEntity<Plan> updatePlan(@PathVariable String planId,
@RequestBody JsonNode incomingData) {
+ public ResponseEntity<Plan> updatePlan(@PathVariable("planId") String
planId, @RequestBody JsonNode incomingData) {
try {
Plan existingPlan = planHandler.getPlanById(planId);
