From b977d39a2f8f7fbf5521a11050db6c1efe2fc3ee Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Fri, 8 Feb 2019 16:15:01 +0100 Subject: [PATCH] Two files for aquarius --- compose-files/aquarius.yml | 8 +++++++ compose-files/aquarius_elasticsearch.yml | 28 ++++++++++++++++++++++++ compose-files/aquarius_mongodb.yml | 21 ++++++++++++++++++ compose-files/elasticsearch.yml | 7 ------ compose-files/mongodb.yml | 8 ------- start_ocean.sh | 20 +++++++++++------ 6 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 compose-files/aquarius_elasticsearch.yml create mode 100644 compose-files/aquarius_mongodb.yml delete mode 100644 compose-files/elasticsearch.yml delete mode 100644 compose-files/mongodb.yml diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index ff5f1ec..be123e1 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -8,5 +8,13 @@ services: backend: ipv4_address: 172.15.0.15 environment: + DB_MODULE: ${DB_MODULE} DB_HOSTNAME: ${DB_HOSTNAME} DB_PORT: ${DB_PORT} + DB_USERNAME: ${DB_USERNAME} + DB_PASSWORD: ${DB_PASSWORD} + DB_SSL: ${DB_SSL} + DB_VERIFY_CERTS: ${DB_VERIFY_CERTS} + DB_CA_CERTS: ${DB_CA_CERTS} + DB_CLIENT_KEY: ${DB_CLIENT_KEY} + DB_CLIENT_CERT: ${DB_CLIENT_CERT} diff --git a/compose-files/aquarius_elasticsearch.yml b/compose-files/aquarius_elasticsearch.yml new file mode 100644 index 0000000..a774087 --- /dev/null +++ b/compose-files/aquarius_elasticsearch.yml @@ -0,0 +1,28 @@ +version: '3' +services: + elasticsearch: + image: elasticsearch:5 + networks: + backend: + ipv4_address: 172.15.0.11 + + aquarius: + image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-stable} + ports: + - 5000:5000 + networks: + backend: + ipv4_address: 172.15.0.15 + depends_on: + - mongodb + environment: + DB_MODULE: ${DB_MODULE} + DB_HOSTNAME: ${DB_HOSTNAME} + DB_PORT: ${DB_PORT} + DB_USERNAME: ${DB_USERNAME} + DB_PASSWORD: ${DB_PASSWORD} + DB_SSL: ${DB_SSL} + DB_VERIFY_CERTS: ${DB_VERIFY_CERTS} + DB_CA_CERTS: ${DB_CA_CERTS} + DB_CLIENT_KEY: ${DB_CLIENT_KEY} + DB_CLIENT_CERT: ${DB_CLIENT_CERT} diff --git a/compose-files/aquarius_mongodb.yml b/compose-files/aquarius_mongodb.yml new file mode 100644 index 0000000..f729df5 --- /dev/null +++ b/compose-files/aquarius_mongodb.yml @@ -0,0 +1,21 @@ +version: '3' +services: + mongodb: + image: mongo:3.6 + command: mongod + networks: + backend: + ipv4_address: 172.15.0.11 + aquarius: + image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-stable} + ports: + - 5000:5000 + networks: + backend: + ipv4_address: 172.15.0.15 + depends_on: + - mongodb + environment: + DB_MODULE: ${DB_MODULE} + DB_HOSTNAME: ${DB_HOSTNAME} + DB_PORT: ${DB_PORT} diff --git a/compose-files/elasticsearch.yml b/compose-files/elasticsearch.yml deleted file mode 100644 index 76193af..0000000 --- a/compose-files/elasticsearch.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: '3' -services: - elasticsearch: - image: elasticsearch:5 - networks: - backend: - ipv4_address: 172.15.0.11 diff --git a/compose-files/mongodb.yml b/compose-files/mongodb.yml deleted file mode 100644 index 5ce3294..0000000 --- a/compose-files/mongodb.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: '3' -services: - mongodb: - image: mongo:3.6 - command: mongod - networks: - backend: - ipv4_address: 172.15.0.11 diff --git a/start_ocean.sh b/start_ocean.sh index ff564f0..db32435 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -36,7 +36,8 @@ export KEEPER_MNEMONIC='' export CONFIGURE_ACL="true" export ACL_CONTRACT_ADDRESS="" -# Default Aquarius Backend to Mongo +# Default Aquarius parameters +export DB_MODULE="mongodb" export DB_HOSTNAME="mongodb" export DB_PORT="27017" @@ -74,8 +75,7 @@ show_banner COMPOSE_FILES="" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pleuston.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/mongodb.yml" +COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_mongodb.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/brizo.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml" @@ -117,8 +117,7 @@ while :; do printf $COLOR_Y'Starting without Brizo...\n\n'$COLOR_RESET ;; --no-aquarius) - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius.yml/}" - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/mongodb.yml/}" + COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius_mongodb.yml/}" printf $COLOR_Y'Starting without Aquarius...\n\n'$COLOR_RESET ;; --no-secret-store) @@ -140,10 +139,17 @@ while :; do # Elasticsearch ################################################# --elasticsearch) - COMPOSE_FILES+=" -f ${COMPOSE_DIR}/elasticsearch.yml" - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/mongodb.yml/}" + COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_elasticsearch.yml" + COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius_mongodb.yml/}" export DB_HOSTNAME="elasticsearch" export DB_PORT="9200" + export DB_USERNAME="elastic" + export DB_PASSWORD="changeme" + export DB_SSL="false" + export DB_VERIFY_CERTS="false" + export DB_CA_CERTS="" + export DB_CLIENT_KEY="" + export DB_CLIENT_CERT="" printf $COLOR_Y'Starting with Elasticsearch...\n\n'$COLOR_RESET ;; #################################################