Skip to content

Commit

Permalink
elasticsearch
Browse files Browse the repository at this point in the history
  • Loading branch information
zpqsunny committed Jun 25, 2024
1 parent 88a8844 commit 8ebd6ca
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
mvn -Dfile.encoding=UTF-8 -DskipTests=true install
cp ./dht-server/target/*-with-dependencies.jar ./dht-server-${{ steps.branch-name.outputs.tag }}.jar
cp ./dht-peer/target/*-with-dependencies.jar ./dht-peer-${{ steps.branch-name.outputs.tag }}.jar
cp ./dht-es/target/*-with-dependencies.jar ./dht-es-${{ steps.branch-name.outputs.tag }}.jar
cp ./dht-elasticsearch/target/*-with-dependencies.jar ./dht-elasticsearch-${{ steps.branch-name.outputs.tag }}.jar
zip -q -r release.zip *.jar
- name: Create Release
id: create_release
Expand Down
4 changes: 4 additions & 0 deletions dht-elasticsearch.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ELASTICSEARCH_HOST=http://127.0.0.1
ELASTICSEARCH_PORT=9200
ELASTICSEARCH_USERNAME=elastic
ELASTICSEARCH_PASSWORD=elastic
4 changes: 2 additions & 2 deletions dht-elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ FROM openjdk:8-jre-alpine
LABEL auther=zpq
WORKDIR /app
ENV TZ=Asia/Shanghai
ADD ./target/dht-elasticsearch-*dependencies.jar ./dht-es.jar
ENTRYPOINT ["java", "-jar", "dht-es.jar"]
ADD ./target/dht-elasticsearch-*dependencies.jar ./dht-elasticsearch.jar
ENTRYPOINT ["java", "-jar", "dht-elasticsearch.jar"]

4 changes: 0 additions & 4 deletions dht-es.env

This file was deleted.

4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
network_mode: host
restart: always
env_file:
- es.env
- elasticsearch.env
volumes:
- /docker/elasticsearch/data:/usr/share/elasticsearch/data
- /docker/elasticsearch/plugins:/usr/share/elasticsearch/plugins
Expand Down Expand Up @@ -107,4 +107,4 @@ services:
env_file:
- dht-redis.env
- dht-mongo.env
- dht-es.env
- dht-elasticsearch.env
File renamed without changes.
10 changes: 5 additions & 5 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ initElasticsearchService() {

initEsIndexAndMapping() {

source dht-es.env
source dht-elasticsearch.env
echo -e "\033[32m drop index if exits \033[0m"
curl -H "Content-Type: application/json" -X DELETE -d '' -u ${ES_USERNAME}:${ES_PASSWORD} ${ES_HOST}:${ES_PORT}/metadata
curl -H "Content-Type: application/json" -X DELETE -d '' -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} ${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/metadata
echo -e "\r\n\033[32m create index \033[0m"
curl -H "Content-Type: application/json" -X PUT -d '{}' -u ${ES_USERNAME}:${ES_PASSWORD} ${ES_HOST}:${ES_PORT}/metadata
curl -H "Content-Type: application/json" -X PUT -d '{}' -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} ${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/metadata
echo -e "\r\n\033[32m update mapping \033[0m"
curl -H "Content-Type: application/json" -X POST -d @mapping.json -u ${ES_USERNAME}:${ES_PASSWORD} ${ES_HOST}:${ES_PORT}/metadata/_mapping
curl -H "Content-Type: application/json" -X POST -d @mapping.json -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} ${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/metadata/_mapping
echo -e "\r\n\033[32m update setting \033[0m"
curl -H "Content-Type: application/json" -X PUT -d @setting.json -u ${ES_USERNAME}:${ES_PASSWORD} ${ES_HOST}:${ES_PORT}/metadata/_settings
curl -H "Content-Type: application/json" -X PUT -d @setting.json -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} ${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/metadata/_settings

}

Expand Down

0 comments on commit 8ebd6ca

Please sign in to comment.