diff --git a/deploy/config.yml b/deploy/config.yml index 9ee6a1c..a2cb6be 100644 --- a/deploy/config.yml +++ b/deploy/config.yml @@ -11,8 +11,8 @@ source: password: root database: dispute_explorer meilisearch: - api_url: http://localhost:7701 - api_key: 2b85b8c251421e43808ee9e20e34e6b001268cee726845d3ba9b40a83fa728e9 + api_url: http://localhost:7700 + api_key: 56313adcb3ebc9220c6b225f7a17d4a1f84183a64ddecac62d179486ed1f0114 sync: - table: dispute_game index: disputegames @@ -60,8 +60,3 @@ sync: - table: sync_events index: syncevents full: true - - - - - diff --git a/deploy/docker-compose-meiliSearch.yml b/deploy/docker-compose-meiliSearch.yml deleted file mode 100644 index 78c65f9..0000000 --- a/deploy/docker-compose-meiliSearch.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: "3" - -services: - meiliSearch: - container_name: meilisearch - image: getmeili/meilisearch:v1.8 - depends_on: - - mysql - - node1 - environment: - - MEILI_MASTER_KEY=123456 - ports: - - "7701:7700" - volumes: - - ./meili_data:/meili_data - - meiliSync: - platform: linux/x86_64 - image: long2ice/meilisync:sha-fc1877d - depends_on: - - mysql - - node1 - - meiliSearch - volumes: - - ./config.yml:/meilisync/config.yml - network_mode: host diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 8ccfb8b..8b8c200 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -7,6 +7,7 @@ services: image: mysql:8.0.28 environment: MYSQL_ROOT_PASSWORD: "root" + restart: always ports: - "3367:3306" volumes: @@ -23,6 +24,32 @@ services: - ../.env network_mode: host + meiliSearch: + container_name: meilisearch + image: getmeili/meilisearch:v1.8 + restart: always + depends_on: + - mysql + - node1 + environment: + - MEILI_MASTER_KEY=123456 + ports: + - "7700:7700" + volumes: + - ./meili_data:/meili_data + + meiliSync: + platform: linux/x86_64 + image: long2ice/meilisync:sha-fc1877d + restart: on-failure + depends_on: + - mysql + - node1 + - meiliSearch + volumes: + - ./config.yml:/meilisync/config.yml + network_mode: host + diff --git a/deploy/start.sh b/deploy/start.sh new file mode 100644 index 0000000..e0267c6 --- /dev/null +++ b/deploy/start.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +docker-compose -f docker-compose.yml up -d + +sleep 5 + +# Bearer Token +bearer_token="123456" + +curl_response=$(curl -s -H "Authorization: Bearer $bearer_token" http://localhost:7700/keys) +new_api_key=$(echo "$curl_response" | jq -r '.results[] | select(.actions[] | contains("*")) | .key') + +yq e ".meilisearch.api_key = \"$new_api_key\"" -i config.yml + +echo "api_key was successfully updated to: $new_api_key" diff --git a/deploy/stop.sh b/deploy/stop.sh new file mode 100644 index 0000000..62526bb --- /dev/null +++ b/deploy/stop.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker-compose -f docker-compose.yml down