1
0
mirror of https://github.com/oceanprotocol/barge.git synced 2024-11-22 01:37:01 +01:00

Merge pull request #403 from oceanprotocol/feature/add_typesense_in_main

Feature/add_typesense_in_main
This commit is contained in:
Alex Coseru 2024-08-08 13:25:02 +03:00 committed by GitHub
commit 52b6fdca54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 72 additions and 50 deletions

View File

@ -106,6 +106,7 @@ The default versions are always a combination of component versions which are co
| ocean-contracts | | v2.0.2 | 172.15.0.14 | | | ocean-contracts | | v2.0.2 | 172.15.0.14 | |
| Aquarius | | v5.1.4 | 172.15.0.5 | 5000 -> 5000 | | Aquarius | | v5.1.4 | 172.15.0.5 | 5000 -> 5000 |
| Elasticsearch | Aquarius | 8.5.1 | 172.15.0.6 | | | Elasticsearch | Aquarius | 8.5.1 | 172.15.0.6 | |
| Typesense | Ocean-node | 0.25.1 | 172.15.0.20 | 8108 -> 8108 |
| Provider | | v2.1.6 | 172.15.0.4 | 8030 -> 8030 | | Provider | | v2.1.6 | 172.15.0.4 | 8030 -> 8030 |
| Provider2 | | v2.1.6 | 172.15.0.7 | 8030 -> 8030 | | Provider2 | | v2.1.6 | 172.15.0.7 | 8030 -> 8030 |
| RBAC Server | | main | 172.15.0.8 | 3000 -> 3000 | | RBAC Server | | main | 172.15.0.8 | 3000 -> 3000 |
@ -155,7 +156,8 @@ export AQUARIUS_LOG_LEVEL=DEBUG
| Option | Description | | Option | Description |
| -------------------------- | ----------------------------------------------------------------------------------------------- | | -------------------------- | ----------------------------------------------------------------------------------------------- |
| `--no-aquarius` | Start up Ocean without the `aquarius` Building Block. | | `--no-aquarius` | Start up Ocean without the `aquarius` Building Block. |
| `--no-elasticsearch` | Start up Ocean without the `elasticsearch` Building Block. | | `--no-elasticsearch` | Start up Ocean without the `elasticsearch` Building Block. |
| `--with-typesense` | Start up Ocean with Typesense |
| `--no-provider` | Start up Ocean without the `provider` Building Block. | | `--no-provider` | Start up Ocean without the `provider` Building Block. |
| `--no-ipfs` | Start up Ocean without the `ipfs` Building Block | | `--no-ipfs` | Start up Ocean without the `ipfs` Building Block |
| `--with-provider2` | Runs a 2nd provider, on port 8031. This is required for ocean.js/ocean.py integration tests. 2nd Provider will use the same image and parameters (log_level, ipfs gateway, compute gateway, etc) as provider1, but has a different private key | | `--with-provider2` | Runs a 2nd provider, on port 8031. This is required for ocean.js/ocean.py integration tests. 2nd Provider will use the same image and parameters (log_level, ipfs gateway, compute gateway, etc) as provider1, but has a different private key |

View File

@ -1,54 +1,56 @@
#/bin/bash #/bin/bash
docker container stop ocean_aquarius_1 docker container stop ocean-aquarius-1
docker container stop ocean_graph-node_1 docker container stop ocean-graph-node-1
docker container stop ocean_subgraph_1 docker container stop ocean-subgraph-1
docker container stop ocean_ipfs_1 docker container stop ocean-ipfs-1
docker container stop ocean_postgres_1 docker container stop ocean-postgres-1
docker container stop ocean_provider_1 docker container stop ocean-provider-1
docker container stop ocean_provider2_1 docker container stop ocean-provider2-1
docker container stop ocean_ocean-contracts_1 docker container stop ocean-ocean-contracts-1
docker container stop ocean_elasticsearch_1 docker container stop ocean-elasticsearch-1
docker container stop ocean_ganache_1 docker container stop ocean-typesense-1
docker container stop ocean_faucet_1 docker container stop ocean-ganache-1
docker container stop ocean_computetodata_1 docker container stop ocean-faucet-1
docker container stop ocean_kindcluster_1 docker container stop ocean-computetodata-1
docker container stop ocean_redis_1 docker container stop ocean-kindcluster-1
docker container stop ocean_dashboard_1 docker container stop ocean-redis-1
docker container stop ocean-dashboard-1
docker container stop docker-registry docker container stop docker-registry
docker container stop ocean_pdr-trader_1 docker container stop ocean-pdr-trader-1
docker container stop ocean_pdr-predictoor1_1 docker container stop ocean-pdr-predictoor1-1
docker container stop ocean_pdr-predictoor2_1 docker container stop ocean-pdr-predictoor2-1
docker container stop ocean_pdr-predictoor3_1 docker container stop ocean-pdr-predictoor3-1
docker container stop ocean_pdr-trueval_1 docker container stop ocean-pdr-trueval-1
docker container stop ocean_pdr-publisher_1 docker container stop ocean-pdr-publisher-1
docker container stop ocean_pdr-dfbuyer_1 docker container stop ocean-pdr-dfbuyer-1
docker container rm ocean_aquarius_1 docker container rm ocean-aquarius-1
docker container rm ocean_graph-node_1 docker container rm ocean-graph-node-1
docker container rm ocean_subgraph_1 docker container rm ocean-subgraph-1
docker container rm ocean_ipfs_1 docker container rm ocean-ipfs-1
docker container rm ocean_postgres_1 docker container rm ocean-postgres-1
docker container rm ocean_provider_1 docker container rm ocean-provider-1
docker container rm ocean_provider2_1 docker container rm ocean-provider2-1
docker container rm ocean_ocean-contracts_1 docker container rm ocean-ocean-contracts-1
docker container rm ocean_elasticsearch_1 docker container rm ocean-elasticsearch-1
docker container rm ocean_ganache_1 docker container rm ocean-typesense-1
docker container rm ocean_faucet_1 docker container rm ocean-ganache-1
docker container rm ocean_computetodata_1 docker container rm ocean-faucet-1
docker container rm ocean_kindcluster_1 docker container rm ocean-computetodata-1
docker container rm ocean_redis_1 docker container rm ocean-kindcluster-1
docker container rm ocean_dashboard_1 docker container rm ocean-redis-1
docker container rm ocean-dashboard-1
docker container rm docker-registry docker container rm docker-registry
docker container rm ocean_pdr-trader_1 docker container rm ocean-pdr-trader-1
docker container rm ocean_pdr-predictoor1_1 docker container rm ocean-pdr-predictoor1-1
docker container rm ocean_pdr-predictoor2_1 docker container rm ocean-pdr-predictoor2-1
docker container rm ocean_pdr-predictoor3_1 docker container rm ocean-pdr-predictoor3-1
docker container rm ocean_pdr-trueval_1 docker container rm ocean-pdr-trueval-1
docker container rm ocean_pdr-publisher_1 docker container rm ocean-pdr-publisher-1
docker container rm ocean_pdr-dfbuyer_1 docker container rm ocean-pdr-dfbuyer-1
docker volume rm ocean_graphipfs docker volume rm ocean-graphipfs
docker volume rm ocean_graphpgsql docker volume rm ocean-graphpgsql
docker volume rm ocean_provider1db docker volume rm ocean-provider1db
docker volume rm ocean_provider2db docker volume rm ocean-provider2db
docker network rm kind docker network rm kind
docker volume rm $(docker volume ls -q) docker volume rm $(docker volume ls -q)

View File

@ -0,0 +1,14 @@
version: '3'
services:
typesense:
image: typesense/typesense:${TYPESENSE_VERSION:-latest}
ports:
- 8108:8108
networks:
backend:
ipv4_address: 172.15.0.20
volumes:
- typesense-data:/data
command: '--data-dir /data --api-key=xyz'
volumes:
typesense-data:

View File

@ -27,7 +27,7 @@ DIR="${DIR/ /\\ }"
COMPOSE_DIR="${DIR}/compose-files" COMPOSE_DIR="${DIR}/compose-files"
# Default versions of Aquarius, Provider # Default versions of Aquarius, Provider
export TYPESENSE_VERSION=${TYPESENSE_VERSION:-0.25.1}
export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v5.1.5} export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v5.1.5}
export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.1} export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.1}
export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.1.6} export PROVIDER_VERSION=${PROVIDER_VERSION:-v2.1.6}
@ -227,6 +227,10 @@ while :; do
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/registry.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/registry.yml"
printf $COLOR_Y'Starting with Registry...\n\n'$COLOR_RESET printf $COLOR_Y'Starting with Registry...\n\n'$COLOR_RESET
;; ;;
--with-typesense)
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/typesense.yml"
printf $COLOR_Y'Starting with Typesense...\n\n'$COLOR_RESET
;;
--with-c2d) --with-c2d)
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/registry.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/registry.yml"
COMPOSE_FILES+=" -f ${COMPOSE_DIR}/ipfs.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/ipfs.yml"