Skip to content

Commit

Permalink
Merge pull request #6 from traPtitech/update-es8
Browse files Browse the repository at this point in the history
Update to es8
  • Loading branch information
motoki317 authored Nov 22, 2023
2 parents e11c13e + 5637ae2 commit eb7d43c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:

env:
IMAGE_NAME: es-with-sudachi
ELASTIC_VER: 7.17.9
SUDACHI_PLUGIN_VER: 3.0.1
ELASTIC_VER: 8.8.1
SUDACHI_PLUGIN_VER: 3.1.0

jobs:
build-image:
Expand Down
11 changes: 6 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ARG ELASTIC_VER
ARG SUDACHI_PLUGIN_VER
ARG SUDACHI_DICT_VER=20230110
# http://sudachi.s3-website-ap-northeast-1.amazonaws.com/sudachidict/
ARG SUDACHI_DICT_VER=20230927


FROM --platform=$BUILDPLATFORM alpine:latest AS plugin-downloader
Expand All @@ -11,7 +12,7 @@ ARG SUDACHI_PLUGIN_VER

RUN apk --no-cache --update add curl

RUN curl -OL https://github.com/WorksApplications/elasticsearch-sudachi/releases/download/v${SUDACHI_PLUGIN_VER}/analysis-sudachi-${ELASTIC_VER}-${SUDACHI_PLUGIN_VER}.zip
RUN curl -OL https://github.com/WorksApplications/elasticsearch-sudachi/releases/download/v${SUDACHI_PLUGIN_VER}/elasticsearch-${ELASTIC_VER}-analysis-sudachi-${SUDACHI_PLUGIN_VER}.zip


FROM --platform=$BUILDPLATFORM alpine:latest AS dict-downloader
Expand All @@ -32,9 +33,9 @@ FROM elasticsearch:${ELASTIC_VER}
ARG ELASTIC_VER
ARG SUDACHI_PLUGIN_VER

COPY --from=plugin-downloader /work/analysis-sudachi-${ELASTIC_VER}-${SUDACHI_PLUGIN_VER}.zip .
RUN bin/elasticsearch-plugin install file://$(pwd)/analysis-sudachi-${ELASTIC_VER}-${SUDACHI_PLUGIN_VER}.zip && \
rm analysis-sudachi-${ELASTIC_VER}-${SUDACHI_PLUGIN_VER}.zip
COPY --from=plugin-downloader /work/elasticsearch-${ELASTIC_VER}-analysis-sudachi-${SUDACHI_PLUGIN_VER}.zip .
RUN bin/elasticsearch-plugin install file://$(pwd)/elasticsearch-${ELASTIC_VER}-analysis-sudachi-${SUDACHI_PLUGIN_VER}.zip && \
rm elasticsearch-${ELASTIC_VER}-analysis-sudachi-${SUDACHI_PLUGIN_VER}.zip

COPY --from=dict-downloader --chown=elasticsearch:root /work/sudachi-dictionary-*/*.dic ./config/sudachi/

Expand Down

0 comments on commit eb7d43c

Please sign in to comment.