Skip to content

Use ES plugin configuration file instead of Dockerfile #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
onokatio wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use ES plugin configuration file instead of Dockerfile #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16f6c5d
use elasticsearch plugin config managing
onokatio Jan 15, 2025
b7acecc
Update README
onokatio Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,10 @@ docker compose stop

# remove current container and images
docker compose rm app
docker rmi weseek/growi:7

# rebuild app container image
# update latest container image
git pull
docker compose build
docker compose pull

# start
docker compose up
Expand Down Expand Up @@ -138,4 +137,4 @@ License
---------

* The MIT License (MIT)
* See LICENSE file.
* See LICENSE file.
5 changes: 2 additions & 3 deletions docker-compose.es7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ services:
retries: 6

elasticsearch:
build:
context: ./elasticsearch/v7
dockerfile: ./Dockerfile
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
environment:
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms256m -Xmx256m" # increase amount if you have enough memory
Expand All @@ -59,6 +57,7 @@ services:
volumes:
- es_data:/usr/share/elasticsearch/data
- ./elasticsearch/v7/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
- ./elasticsearch/v7/config/elasticsearch-plugins.yml:/usr/share/elasticsearch/config/elasticsearch-plugins.yml
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9200"]
interval: 10s
Expand Down
5 changes: 2 additions & 3 deletions docker-compose.v70x-es7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ services:
retries: 6

elasticsearch:
build:
context: ./elasticsearch/v7
dockerfile: ./Dockerfile
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
environment:
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms256m -Xmx256m" # increase amount if you have enough memory
Expand All @@ -59,6 +57,7 @@ services:
volumes:
- es_data:/usr/share/elasticsearch/data
- ./elasticsearch/v7/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
- ./elasticsearch/v7/config/elasticsearch-plugins.yml:/usr/share/elasticsearch/config/elasticsearch-plugins.yml
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9200"]
interval: 10s
Expand Down
5 changes: 2 additions & 3 deletions docker-compose.v70x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ services:
retries: 6

elasticsearch:
build:
context: ./elasticsearch/v8
dockerfile: ./Dockerfile
image: docker.elastic.co/elasticsearch/elasticsearch:8.7.0
environment:
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms256m -Xmx256m" # increase amount if you have enough memory
Expand All @@ -59,6 +57,7 @@ services:
volumes:
- es_data:/usr/share/elasticsearch/data
- ./elasticsearch/v8/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
- ./elasticsearch/v8/config/elasticsearch-plugins.yml:/usr/share/elasticsearch/config/elasticsearch-plugins.yml
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9200"]
interval: 10s
Expand Down
5 changes: 2 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ services:
retries: 6

elasticsearch:
build:
context: ./elasticsearch/v8
dockerfile: ./Dockerfile
image: docker.elastic.co/elasticsearch/elasticsearch:8.7.0
environment:
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms256m -Xmx256m" # increase amount if you have enough memory
Expand All @@ -59,6 +57,7 @@ services:
volumes:
- es_data:/usr/share/elasticsearch/data
- ./elasticsearch/v8/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
- ./elasticsearch/v8/config/elasticsearch-plugins.yml:/usr/share/elasticsearch/config/elasticsearch-plugins.yml
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9200"]
interval: 10s
Expand Down
6 changes: 0 additions & 6 deletions elasticsearch/v7/Dockerfile
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions elasticsearch/v7/config/elasticsearch-plugins.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins:
- id: analysis-kuromoji
- id: analysis-icu
6 changes: 0 additions & 6 deletions elasticsearch/v8/Dockerfile
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions elasticsearch/v8/config/elasticsearch-plugins.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins:
- id: analysis-kuromoji
- id: analysis-icu