From 5637ae2247ec13141fced7098e6239f37d1d4fdf Mon Sep 17 00:00:00 2001 From: motoki317 Date: Wed, 22 Nov 2023 22:38:20 +0900 Subject: [PATCH] Update to latest es / sudachi versions --- .github/workflows/master.yaml | 4 ++-- Dockerfile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml index 0775ba5..c5749d2 100644 --- a/.github/workflows/master.yaml +++ b/.github/workflows/master.yaml @@ -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: diff --git a/Dockerfile b/Dockerfile index 172764f..14f9170 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,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 @@ -33,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/