You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ya...@apache.org on 2025/04/23 17:32:01 UTC
(airavata) 04/24: updated devcontainer and compose for easy use in vscode
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 4c8d9db1b498ab094652d0698e4222c4feedd91f
Author: yasith <ya...@gatech.edu>
AuthorDate: Fri Mar 14 17:54:18 2025 +0000
updated devcontainer and compose for easy use in vscode
---
.devcontainer/devcontainer.json | 2 +
.../src/main/resources/application.yml | 2 +-
.../resources/distribution/conf/application.yml | 2 +-
.../src/main/containers/docker-compose.yml | 90 +++++++++++++++++-----
.../src/main/resources/airavata-server.properties | 20 ++---
.../mysql/airavata-server.properties | 6 +-
.../src/main/assembly/load-client-bin-assembly.xml | 2 +-
.../src/main/resources/client_truststore.jks | 1 -
8 files changed, 89 insertions(+), 36 deletions(-)
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 809b5b89db..fa765ba98a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -36,6 +36,8 @@
"customizations": {
"vscode": {
"extensions": [
+ "esbenp.prettier-vscode",
+ "foxundermoon.shell-format",
"golang.go",
"lkrms.inifmt",
"ms-python.python",
diff --git a/modules/agent-framework/agent-service/src/main/resources/application.yml b/modules/agent-framework/agent-service/src/main/resources/application.yml
index 3ffce48f7a..30b777097f 100644
--- a/modules/agent-framework/agent-service/src/main/resources/application.yml
+++ b/modules/agent-framework/agent-service/src/main/resources/application.yml
@@ -13,7 +13,7 @@ spring:
max-file-size: 200MB
max-request-size: 200MB
datasource:
- url: "jdbc:mariadb://localhost:13306/app_catalog"
+ url: "jdbc:mariadb://airavata.host:13306/app_catalog"
username: "root"
password: "123456"
driver-class-name: org.mariadb.jdbc.Driver
diff --git a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
index 59099eea03..6279e3afc1 100644
--- a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
+++ b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
@@ -12,7 +12,7 @@ spring:
max-file-size: 200MB
max-request-size: 200MB
datasource:
- url: "jdbc:mariadb://localhost:13306/app_catalog"
+ url: "jdbc:mariadb://airavata.host:13306/app_catalog"
username: "root"
password: "123456"
driver-class-name: org.mariadb.jdbc.Driver
diff --git a/modules/ide-integration/src/main/containers/docker-compose.yml b/modules/ide-integration/src/main/containers/docker-compose.yml
index 0fee0f7199..e8b80cdf6d 100644
--- a/modules/ide-integration/src/main/containers/docker-compose.yml
+++ b/modules/ide-integration/src/main/containers/docker-compose.yml
@@ -2,6 +2,14 @@ networks:
airavata-network:
driver: bridge
name: airavata.host
+ ipam:
+ config:
+ - subnet: 192.168.100.0/24
+ gateway: 192.168.100.1
+
+volumes:
+ db_data:
+ driver: local
services:
devcontainer:
@@ -10,13 +18,17 @@ services:
- ./../../../../..:/workspace:cached
command: sleep infinity
networks:
- - airavata-network
+ airavata-network:
+ ipv4_address: 192.168.100.10
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
keycloak:
image: keycloak/keycloak:24.0
restart: always
environment:
- - KEYCLOAK_ADMIN=admin
- - KEYCLOAK_ADMIN_PASSWORD=admin
+ KEYCLOAK_ADMIN: admin
+ KEYCLOAK_ADMIN_PASSWORD: admin
ports:
- "18080:8080"
- "8443:8443"
@@ -24,38 +36,56 @@ services:
- ./keycloak/realm-default.json:/opt/keycloak/data/import/realm-default.json
- ./keycloak/keycloak.conf:/opt/keycloak/conf/keycloak.conf
- ../../../../../keystores/airavata.jks:/opt/keycloak/conf/keystores/airavata.jks
- command: [ "start-dev", "--import-realm" ]
+ command: ["start-dev", "--import-realm"]
depends_on:
- db
networks:
- - airavata-network
+ airavata-network:
+ ipv4_address: 192.168.100.11
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
db:
image: mariadb:10.4.13
restart: always
environment:
- - MYSQL_ROOT_PASSWORD=123456
- - MYSQL_USER=airavata
- - MYSQL_PASSWORD=123456
+ MYSQL_ROOT_PASSWORD: 123456
+ MYSQL_USER: airavata
+ MYSQL_PASSWORD: 123456
volumes:
- ./database_scripts/init:/docker-entrypoint-initdb.d
- - database_data:/var/lib/mysql
+ - db_data:/var/lib/mysql
ports:
- "13306:3306"
- command: [ 'mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci', '--sql_mode=' ]
+ command:
+ [
+ "mysqld",
+ "--character-set-server=utf8mb4",
+ "--collation-server=utf8mb4_unicode_ci",
+ "--sql-mode=NO_ENGINE_SUBSTITUTION",
+ ]
networks:
- - airavata-network
+ airavata-network:
+ ipv4_address: 192.168.100.12
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
rabbitmq:
image: rabbitmq:3.12-management
restart: always
environment:
- - RABBITMQ_DEFAULT_VHOST=develop
+ RABBITMQ_DEFAULT_VHOST: develop
ports:
- "5672:5672"
- "15672:15672"
depends_on:
- db
networks:
- - airavata-network
+ airavata-network:
+ ipv4_address: 192.168.100.13
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
zookeeper:
image: zookeeper
restart: always
@@ -63,7 +93,11 @@ services:
ports:
- "12181:2181"
networks:
- - airavata-network
+ airavata-network:
+ ipv4_address: 192.168.100.14
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
kafka:
image: wurstmeister/kafka:latest
restart: always
@@ -71,12 +105,16 @@ services:
ports:
- "9092:9092"
environment:
- KAFKA_ADVERTISED_HOST_NAME: localhost
+ KAFKA_ADVERTISED_HOST_NAME: 192.168.100.15
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
depends_on:
- zookeeper
networks:
- - airavata-network
+ airavata-network:
+ ipv4_address: 192.168.100.15
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
sshd:
image: dimuthuupe/sshd:1.0
restart: always
@@ -84,7 +122,21 @@ services:
- /tmp:/tmp
ports:
- "22222:22"
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.16
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
-volumes:
- database_data:
- driver: local
+ adminer:
+ image: adminer:latest
+ restart: always
+ ports:
+ - "18088:8080"
+ depends_on:
+ - db
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.17
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
diff --git a/modules/ide-integration/src/main/resources/airavata-server.properties b/modules/ide-integration/src/main/resources/airavata-server.properties
index c48388205a..95fe8ef53b 100644
--- a/modules/ide-integration/src/main/resources/airavata-server.properties
+++ b/modules/ide-integration/src/main/resources/airavata-server.properties
@@ -30,7 +30,7 @@
###########################################################################
registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.url=jdbc:mariadb://localhost:13306/experiment_catalog
+registry.jdbc.url=jdbc:mariadb://airavata.host:13306/experiment_catalog
registry.jdbc.user=root
registry.jdbc.password=123456
#FIXME: Probably the following property should be removed.
@@ -59,7 +59,7 @@ cluster.status.monitoring.repeat.time=18000
# Application Catalog DB Configuration
###########################################################################
appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.url=jdbc:mariadb://localhost:13306/app_catalog
+appcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/app_catalog
appcatalog.jdbc.user=root
appcatalog.jdbc.password=123456
appcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -68,7 +68,7 @@ appcatalog.validationQuery=SELECT 1 from CONFIGURATION
# Replica Catalog DB Configuration
###########################################################################
replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.url=jdbc:mariadb://localhost:13306/replica_catalog
+replicacatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/replica_catalog
replicacatalog.jdbc.user=root
replicacatalog.jdbc.password=123456
replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -77,7 +77,7 @@ replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
# Workflow Catalog DB Configuration
###########################################################################
workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-workflowcatalog.jdbc.url=jdbc:mariadb://localhost:13306/workflow_catalog
+workflowcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/workflow_catalog
workflowcatalog.jdbc.user=root
workflowcatalog.jdbc.password=123456
workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -86,7 +86,7 @@ workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
# Sharing Catalog DB Configuration
###########################################################################
sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-sharingcatalog.jdbc.url=jdbc:mariadb://localhost:13306/sharing_catalog
+sharingcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/sharing_catalog
sharingcatalog.jdbc.user=root
sharingcatalog.jdbc.password=123456
sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -166,7 +166,7 @@ job.notification.flags=abe
credential.store.keystore.url=keystores/airavata_sym.jks
credential.store.keystore.alias=airavata
credential.store.keystore.password=airavata
-credential.store.jdbc.url=jdbc:mariadb://localhost:13306/credential_store
+credential.store.jdbc.url=jdbc:mariadb://airavata.host:13306/credential_store
credential.store.jdbc.user=root
credential.store.jdbc.password=123456
credential.store.jdbc.driver=org.mariadb.jdbc.Driver
@@ -183,7 +183,7 @@ email.password=xxx
email.ssl=true
email.from=airavata@apache.org
-rabbitmq.broker.url=amqp://guest:guest@localhost:5672/develop
+rabbitmq.broker.url=amqp://guest:guest@airavata.host:5672/develop
rabbitmq.status.exchange.name=status_exchange
rabbitmq.process.exchange.name=process_exchange
rabbitmq.experiment.exchange.name=experiment_exchange
@@ -196,7 +196,7 @@ experiment.launch..queue.name=experiment.launch.queue
# Zookeeper Server Configuration
###########################################################################
embedded.zk=false
-zookeeper.server.connection=localhost:12181
+zookeeper.server.connection=airavata.host:12181
zookeeper.timeout=30000
########################################################################
@@ -221,7 +221,7 @@ in.memory.cache.size=1000
# Kafka Logging related configuration
isRunningOnAws=false
-kafka.broker.list=localhost:9092
+kafka.broker.list=airavata.host:9092
kafka.topic.prefix=local
enable.kafka.logging=false
@@ -232,7 +232,7 @@ profile.service.server.host=0.0.0.0
profile.service.server.port=8962
profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
# MariaDB properties
-profile.service.jdbc.url=jdbc:mariadb://localhost:13306/profile_service
+profile.service.jdbc.url=jdbc:mariadb://airavata.host:13306/profile_service
profile.service.jdbc.user=root
profile.service.jdbc.password=123456
profile.service.jdbc.driver=org.mariadb.jdbc.Driver
diff --git a/modules/registry/registry-core/src/main/resources/migrations-util/mysql/airavata-server.properties b/modules/registry/registry-core/src/main/resources/migrations-util/mysql/airavata-server.properties
index 4c84198305..ed79857f8d 100644
--- a/modules/registry/registry-core/src/main/resources/migrations-util/mysql/airavata-server.properties
+++ b/modules/registry/registry-core/src/main/resources/migrations-util/mysql/airavata-server.properties
@@ -31,7 +31,7 @@
#for derby [AiravataJPARegistry]
registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.url=jdbc:mariadb://localhost:13306/experiment_catalog
+registry.jdbc.url=jdbc:mariadb://airavata.host:13306/experiment_catalog
registry.jdbc.user=airavata
registry.jdbc.password=123456
validationQuery=SELECT 1 from CONFIGURATION
@@ -47,7 +47,7 @@ default.registry.oauth.client.secret=client_secret
###########################################################################
#for derby [AiravataJPARegistry]
appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.url=jdbc:mariadb://localhost:13306/app_catalog
+appcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/app_catalog
appcatalog.jdbc.user=airavata
appcatalog.jdbc.password=123456
appcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -57,7 +57,7 @@ appcatalog.validationQuery=SELECT 1 from CONFIGURATION
###########################################################################
#for derby [AiravataJPARegistry]
replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.url=jdbc:mariadb://localhost:13306/replica_catalog
+replicacatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/replica_catalog
replicacatalog.jdbc.user=airavata
replicacatalog.jdbc.password=123456
replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
diff --git a/tools/load-client/src/main/assembly/load-client-bin-assembly.xml b/tools/load-client/src/main/assembly/load-client-bin-assembly.xml
index 60d7f7fa55..964fafa6ef 100644
--- a/tools/load-client/src/main/assembly/load-client-bin-assembly.xml
+++ b/tools/load-client/src/main/assembly/load-client-bin-assembly.xml
@@ -54,7 +54,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>../../keystores</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>777</fileMode>
<includes>
diff --git a/tools/load-client/src/main/resources/client_truststore.jks b/tools/load-client/src/main/resources/client_truststore.jks
deleted file mode 120000
index e00ca795ca..0000000000
--- a/tools/load-client/src/main/resources/client_truststore.jks
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../keystores/client_truststore.jks
\ No newline at end of file