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 efa5548bac updated the docker repo name
efa5548bac is described below
commit efa5548bac3bd1dc316b8252873eb9d110a4d9ed
Author: lahiruj <[email protected]>
AuthorDate: Mon Feb 17 20:11:58 2025 -0500
updated the docker repo name
---
.../airavata/agent/connection/service/services/AiravataService.java | 2 +-
modules/agent-framework/airavata-agent/build-container.sh | 4 ++--
modules/agent-framework/airavata-agent/jupyter/README.md | 4 ++--
modules/agent-framework/airavata-agent/jupyter/build-jupyter-image.sh | 2 +-
.../airavata-agent/jupyter/deployments/cerebrum/README.md | 2 +-
.../airavata-agent/jupyter/deployments/cerebrum/v1l4/agent/Dockerfile | 2 +-
.../jupyter/deployments/cerebrum/v1l4/agent/build-container.sh | 4 ++--
.../deployments/cerebrum/v1l4/jupyterlab/build-jupyter-image.sh | 2 +-
.../deployments/cerebrum/v1l4/jupyterlab/run-jupyter-lab-container.sh | 2 +-
.../airavata-agent/jupyter/deployments/i-guide/agent/README.md | 2 +-
.../jupyter/deployments/i-guide/agent/build-container.sh | 4 ++--
.../jupyter/deployments/i-guide/jupyterlab/build-jupyter-image.sh | 2 +-
.../jupyter/deployments/i-guide/jupyterlab/labconfig/device_auth.py | 2 +-
.../deployments/i-guide/jupyterlab/run-jupyter-lab-container.sh | 2 +-
14 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
index 13e3a247bd..5151c0f1ed 100644
---
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
+++
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
@@ -75,7 +75,7 @@ public class AiravataService {
List<GroupResourceProfile> groupResourceList =
airavataClient.getGroupResourceList(UserContext.authzToken(),
UserContext.gatewayId());
return groupResourceList.stream()
- .filter(profile ->
"Default".equals(profile.getGroupResourceProfileName()))
+ .filter(profile ->
"Default".equals(profile.getGroupResourceProfileName())) // TODO parameterized
the group resource profile
.flatMap(profile -> profile.getComputePreferences().stream())
.map(GroupComputeResourcePreference::getComputeResourceId)
.filter(computeResourceId ->
computeResourceId.startsWith(remoteCluster))
diff --git a/modules/agent-framework/airavata-agent/build-container.sh
b/modules/agent-framework/airavata-agent/build-container.sh
index 411d222405..a7c5dc772b 100755
--- a/modules/agent-framework/airavata-agent/build-container.sh
+++ b/modules/agent-framework/airavata-agent/build-container.sh
@@ -1,4 +1,4 @@
env GOOS=linux GOARCH=amd64 go build
cp airavata-agent airavata-agent-linux
-docker build --platform linux/x86_64 -t dimuthuupe/airavata-agent .
-docker push dimuthuupe/airavata-agent
\ No newline at end of file
+docker build --platform linux/x86_64 -t cybershuttle/airavata-agent .
+docker push cybershuttle/airavata-agent
\ No newline at end of file
diff --git a/modules/agent-framework/airavata-agent/jupyter/README.md
b/modules/agent-framework/airavata-agent/jupyter/README.md
index 2b42768911..701544f808 100644
--- a/modules/agent-framework/airavata-agent/jupyter/README.md
+++ b/modules/agent-framework/airavata-agent/jupyter/README.md
@@ -45,8 +45,8 @@ twine upload dist/*
### Jupyter container setup
#### Build
-docker build --platform linux/x86_64 -t dimuthuupe/airavata-jupyter-lab .
+docker build --platform linux/x86_64 -t cybershuttle/airavata-jupyter-lab .
#### Run
-docker run --privileged --device /dev/fuse --platform linux/x86_64
--security-opt apparmor:unconfined -p 18888:8888
dimuthuupe/airavata-jupyter-lab
+docker run --privileged --device /dev/fuse --platform linux/x86_64
--security-opt apparmor:unconfined -p 18888:8888
cybershuttle/airavata-jupyter-lab
diff --git
a/modules/agent-framework/airavata-agent/jupyter/build-jupyter-image.sh
b/modules/agent-framework/airavata-agent/jupyter/build-jupyter-image.sh
index 8f06f6b52c..2e31b2e6b6 100755
--- a/modules/agent-framework/airavata-agent/jupyter/build-jupyter-image.sh
+++ b/modules/agent-framework/airavata-agent/jupyter/build-jupyter-image.sh
@@ -1 +1 @@
-docker build --platform linux/x86_64 -t dimuthuupe/airavata-jupyter-lab .
\ No newline at end of file
+docker build --platform linux/x86_64 -t cybershuttle/airavata-jupyter-lab .
\ No newline at end of file
diff --git
a/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/README.md
b/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/README.md
index 54f9fd41f7..9d45fcc94b 100644
---
a/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/README.md
+++
b/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/README.md
@@ -9,7 +9,7 @@ cd v1l4
Execute the following command to run an agent locally.
```shell
-docker run --rm -v $(pwd):/workspace -w /workspace
lahiruj/airavata-cerebrum-agent bash -c "./docker-agent.sh"
+docker run --rm -v $(pwd):/workspace -w /workspace
cybershuttle/airavata-cerebrum-agent bash -c "./docker-agent.sh"
```
### Jupyter lab
diff --git
a/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/agent/Dockerfile
b/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/agent/Dockerfile
index 8b08a109da..e513a156b8 100644
---
a/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/agent/Dockerfile
+++
b/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM dimuthuupe/airavata-agent:latest
+FROM cybershuttle/airavata-agent:latest
USER root
diff --git
a/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/agent/build-container.sh
b/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/agent/build-container.sh
index ce923b3f3d..a8384df559 100755
---
a/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/agent/build-container.sh
+++
b/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/agent/build-container.sh
@@ -2,5 +2,5 @@ cd ../../../../../
env GOOS=linux GOARCH=amd64 go build
cp airavata-agent jupyter/deployments/cerebrum/v1l4/agent/airavata-agent-linux
cd jupyter/deployments/cerebrum/v1l4/agent
-docker build --platform linux/x86_64 -t lahiruj/airavata-cerebrum-agent .
-docker push lahiruj/airavata-cerebrum-agent
\ No newline at end of file
+docker build --platform linux/x86_64 -t cybershuttle/airavata-cerebrum-agent .
+docker push cybershuttle/airavata-cerebrum-agent
\ No newline at end of file
diff --git
a/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/jupyterlab/build-jupyter-image.sh
b/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/jupyterlab/build-jupyter-image.sh
index d6df5ac140..f4a2b0ea9e 100755
---
a/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/jupyterlab/build-jupyter-image.sh
+++
b/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/jupyterlab/build-jupyter-image.sh
@@ -1 +1 @@
-docker build --platform linux/x86_64 -t lahiruj/cerebrum-jupyter-lab .
\ No newline at end of file
+docker build --platform linux/x86_64 -t cybershuttle/cerebrum-jupyter-lab .
\ No newline at end of file
diff --git
a/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/jupyterlab/run-jupyter-lab-container.sh
b/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/jupyterlab/run-jupyter-lab-container.sh
index 59906b0c8d..c9247c49a3 100755
---
a/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/jupyterlab/run-jupyter-lab-container.sh
+++
b/modules/agent-framework/airavata-agent/jupyter/deployments/cerebrum/v1l4/jupyterlab/run-jupyter-lab-container.sh
@@ -1 +1 @@
-docker run -p 18888:8888 -it lahiruj/cerebrum-jupyter-lab
\ No newline at end of file
+docker run -p 18888:8888 -it cybershuttle/cerebrum-jupyter-lab
\ No newline at end of file
diff --git
a/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/agent/README.md
b/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/agent/README.md
index 994186a3cb..81e52bfb96 100644
---
a/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/agent/README.md
+++
b/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/agent/README.md
@@ -8,7 +8,7 @@ Build the Agent
Execute the following command to run an agent locally.
```shell
-docker run --rm -v $(pwd):/workspace -w /workspace
dimuthuupe/airavata-iguide-agent bash -c "./docker-agent.sh"
+docker run --rm -v $(pwd):/workspace -w /workspace
cybershuttle/airavata-iguide-agent bash -c "./docker-agent.sh"
```
diff --git
a/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/agent/build-container.sh
b/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/agent/build-container.sh
index a15af8d8ac..c98ab20b19 100755
---
a/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/agent/build-container.sh
+++
b/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/agent/build-container.sh
@@ -2,5 +2,5 @@ cd ../../../../
env GOOS=linux GOARCH=amd64 go build
cp airavata-agent jupyter/deployments/i-guide/agent/airavata-agent-linux
cd jupyter/deployments/i-guide/agent
-docker build --platform linux/x86_64 -t dimuthuupe/airavata-iguide-agent .
-docker push dimuthuupe/airavata-iguide-agent
\ No newline at end of file
+docker build --platform linux/x86_64 -t cybershuttle/airavata-iguide-agent .
+docker push cybershuttle/airavata-iguide-agent
\ No newline at end of file
diff --git
a/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/build-jupyter-image.sh
b/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/build-jupyter-image.sh
index cdf1966a11..96c79b9baf 100755
---
a/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/build-jupyter-image.sh
+++
b/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/build-jupyter-image.sh
@@ -1 +1 @@
-docker build --platform linux/x86_64 -t dimuthuupe/iguide-jupyter-lab .
\ No newline at end of file
+docker build --platform linux/x86_64 -t cybershuttle/iguide-jupyter-lab .
\ No newline at end of file
diff --git
a/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/labconfig/device_auth.py
b/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/labconfig/device_auth.py
index a13253a8f4..269085ca69 100644
---
a/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/labconfig/device_auth.py
+++
b/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/labconfig/device_auth.py
@@ -6,7 +6,7 @@ import os
class DeviceFlowAuthenticator:
def __init__(self):
self.client_id = "cybershuttle-agent"
- self.realm = "10000000"
+ self.realm = "default"
self.auth_server_url = "https://auth.cybershuttle.org"
if not self.client_id or not self.realm or not self.auth_server_url:
diff --git
a/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/run-jupyter-lab-container.sh
b/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/run-jupyter-lab-container.sh
index ebc2d547f6..ac3e01c5db 100755
---
a/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/run-jupyter-lab-container.sh
+++
b/modules/agent-framework/airavata-agent/jupyter/deployments/i-guide/jupyterlab/run-jupyter-lab-container.sh
@@ -1 +1 @@
-docker run -p 18888:8888 -it dimuthuupe/iguide-jupyter-lab
\ No newline at end of file
+docker run -p 18888:8888 -it cybershuttle/iguide-jupyter-lab
\ No newline at end of file