diff --git a/containers/docker-compose-local.yml b/containers/docker-compose-local.yml index 4c784c8846..68a5d65fd9 100644 --- a/containers/docker-compose-local.yml +++ b/containers/docker-compose-local.yml @@ -7,4 +7,3 @@ include: - scripts/docker-compose-taskrunner.yml - scripts/docker-compose-data-services.yml - scripts/docker-compose-sim-services.yml - - scripts/docker-compose-model-services.yml diff --git a/containers/scripts/docker-compose-hmi.yml b/containers/scripts/docker-compose-hmi.yml index 7018d804a2..21d2005c81 100644 --- a/containers/scripts/docker-compose-hmi.yml +++ b/containers/scripts/docker-compose-hmi.yml @@ -27,7 +27,6 @@ services: AWS_ACCESS_KEY_ID: "admin" AWS_SECRET_ACCESS_KEY: "admin123" KNOWLEDGE-MIDDLEWARE_URL: "http://${local_host_name}:3060" - MODEL-SERVICE_URL: "http://${local_host_name}:3010" SPICEDB_LAUNCHMODE: "PLAINTEXT" SPICEDB_SHARED-KEY: "dev" SPICEDB_TARGET: "${local_host_name}:50051" @@ -85,8 +84,6 @@ services: condition: service_healthy knowledge-middleware-api: condition: service_started - model-service: - condition: service_started extra_hosts: - "host.docker.internal:host-gateway" diff --git a/containers/scripts/docker-compose-model-services.yml b/containers/scripts/docker-compose-model-services.yml deleted file mode 100644 index 82ee113bb9..0000000000 --- a/containers/scripts/docker-compose-model-services.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -version: "3.9" - -services: - model-service: - container_name: model-service - image: ghcr.io/darpa-askem/model-service:latest - networks: - - terarium - ports: - - "3010:8888" - extra_hosts: - - "host.docker.internal:host-gateway" diff --git a/packages/server/src/main/resources/application-local.properties b/packages/server/src/main/resources/application-local.properties index 063e412bd1..20fa349743 100644 --- a/packages/server/src/main/resources/application-local.properties +++ b/packages/server/src/main/resources/application-local.properties @@ -17,7 +17,6 @@ terarium.elasticsearch.auth-enabled=false # Microservice configurations ######################################################################################################################## knowledge-middleware.url=http://localhost:3060 -model-service.url=http://localhost:3010 terarium.dataservice.url=http://localhost:3020 simulation-service.url=http://localhost:3030 ciemss-service.url=http://localhost:3040 diff --git a/packages/server/src/main/resources/application.properties b/packages/server/src/main/resources/application.properties index b40fcc8678..a90afa6998 100644 --- a/packages/server/src/main/resources/application.properties +++ b/packages/server/src/main/resources/application.properties @@ -135,7 +135,6 @@ github.url=https://api.github.com jsdelivr.url=https://cdn.jsdelivr.net knowledge-middleware.url=https://knowledge-middleware.staging.terarium.ai mira-api.url=http://34.230.33.149:8771 -model-service.url=https://model-service.staging.terarium.ai skema-py.url=https://skema-py.staging.terarium.ai skema-rs.url=https://skema-rs.staging.terarium.ai skema-unified.url=https://api.askem.lum.ai diff --git a/packages/server/src/test/resources/application-test.properties b/packages/server/src/test/resources/application-test.properties index ba2a075e08..e00060d138 100644 --- a/packages/server/src/test/resources/application-test.properties +++ b/packages/server/src/test/resources/application-test.properties @@ -38,7 +38,6 @@ terarium.elasticsearch.index.suffix=tera_test_1.0 # Microservice configurations ######################################################################################################################## knowledge-middleware.url=http://localhost:3060 -model-service.url=http://localhost:3010 terarium.dataservice.url=http://localhost:3020 ########################################################################################################################