-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Revisited smoke test v9.4.0 Dockerfiles and added a local Mor…
- Loading branch information
1 parent
b60b56b
commit b088650
Showing
3 changed files
with
23 additions
and
155 deletions.
There are no files selected for viewing
130 changes: 0 additions & 130 deletions
130
src/main/java/com/worksap/nlp/sudachi/MorphemeImpl.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,23 +42,22 @@ FROM solr:9.4.0@sha256:4e9b6794895f1f6685a61d587b63e2f0caa2b6f9a5a2c0e67613d4f16 | |
|
|
||
| MAINTAINER Alexander Zagniotov <[email protected]> | ||
|
|
||
| ENV SOLR_JAVA_MEM="-Xms4g -Xmx4g" | ||
| ENV SOLR_INSTALL_DIR=/opt/solr | ||
| ENV SOLR_SERVER_HOME=$SOLR_INSTALL_DIR/server | ||
|
|
||
| # https://solr.apache.org/guide/solr/9_4/configuration-guide/libs.html#lib-directories | ||
| ENV SOLR_INSTALL_LIB_DIR=$SOLR_INSTALL_DIR/lib | ||
|
|
||
| ENV SOLR_JAVA_MEM="-Xms2g -Xmx2g" | ||
| ENV SOLR_OPT_DIR=/opt/solr | ||
| ENV SOLR_SERVER_HOME=$SOLR_OPT_DIR/server | ||
| ENV SUDACHI_DICT_HOME=/tmp/sudachi | ||
| ENV SUDACHI_SYSTEM_DICT=$SOLR_INSTALL_DIR/system.dict | ||
| ENV SUDACHI_USER_DICT=$SOLR_INSTALL_DIR/user_lexicon.dict | ||
| ENV SOLR_WEB_INF_LIB_HOME=$SOLR_SERVER_HOME/solr-webapp/webapp/WEB-INF/lib | ||
|
|
||
| ENV SUDACHI_SYSTEM_DICT=$SOLR_OPT_DIR/system.dict | ||
| ENV SUDACHI_USER_DICT=$SOLR_OPT_DIR/user_lexicon.dict | ||
|
|
||
| USER root | ||
|
|
||
| # https://solr.apache.org/guide/solr/9_4/configuration-guide/libs.html#lib-directories | ||
| COPY --from=BUILD_JAR_STAGE /home/gradle/solr-lucene-analyzer-sudachi/build/libs/solr-lucene-analyzer-sudachi*.jar $SOLR_INSTALL_LIB_DIR/ | ||
| COPY --from=BUILD_JAR_STAGE $SUDACHI_DICT_HOME/system-dict/system.dict $SOLR_INSTALL_DIR/system.dict | ||
| COPY --from=BUILD_JAR_STAGE $SUDACHI_DICT_HOME/user_lexicon.dict $SOLR_INSTALL_DIR/user_lexicon.dict | ||
| # Copy dictionaries to /opt/solr | ||
| # See https://github.com/apache/solr-docker/blob/7e3be2fce98be1fe9c80be0727b4600d4b52fd0f/9.3/Dockerfile#L129 | ||
| COPY --from=BUILD_JAR_STAGE $SUDACHI_DICT_HOME/system-dict/system.dict $SOLR_OPT_DIR/system.dict | ||
| COPY --from=BUILD_JAR_STAGE $SUDACHI_DICT_HOME/user_lexicon.dict $SOLR_OPT_DIR/user_lexicon.dict | ||
| COPY --from=BUILD_JAR_STAGE /home/gradle/solr-lucene-analyzer-sudachi/build/libs/solr-lucene-analyzer-sudachi*.jar $SOLR_WEB_INF_LIB_HOME/ | ||
| COPY schema.xml $SOLR_SERVER_HOME/solr/configsets/_default/conf/managed-schema.xml | ||
|
|
||
| USER solr | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,22 +43,21 @@ FROM solr:9.4.0@sha256:fbb40ba32b4092aa7e81f49b66dea2628b66950121853ac6792674ee8 | |
| MAINTAINER Alexander Zagniotov <[email protected]> | ||
|
|
||
| ENV SOLR_JAVA_MEM="-Xms4g -Xmx4g" | ||
| ENV SOLR_INSTALL_DIR=/opt/solr | ||
| ENV SOLR_SERVER_HOME=$SOLR_INSTALL_DIR/server | ||
|
|
||
| # https://solr.apache.org/guide/solr/9_4/configuration-guide/libs.html#lib-directories | ||
| ENV SOLR_INSTALL_LIB_DIR=$SOLR_INSTALL_DIR/lib | ||
|
|
||
| ENV SOLR_OPT_DIR=/opt/solr | ||
| ENV SOLR_SERVER_HOME=$SOLR_OPT_DIR/server | ||
| ENV SUDACHI_DICT_HOME=/tmp/sudachi | ||
| ENV SUDACHI_SYSTEM_DICT=$SOLR_INSTALL_DIR/system.dict | ||
| ENV SUDACHI_USER_DICT=$SOLR_INSTALL_DIR/user_lexicon.dict | ||
| ENV SOLR_WEB_INF_LIB_HOME=$SOLR_SERVER_HOME/solr-webapp/webapp/WEB-INF/lib | ||
|
|
||
| ENV SUDACHI_SYSTEM_DICT=$SOLR_OPT_DIR/system.dict | ||
| ENV SUDACHI_USER_DICT=$SOLR_OPT_DIR/user_lexicon.dict | ||
|
|
||
| USER root | ||
|
|
||
| # https://solr.apache.org/guide/solr/9_4/configuration-guide/libs.html#lib-directories | ||
| COPY --from=BUILD_JAR_STAGE /home/gradle/solr-lucene-analyzer-sudachi/build/libs/solr-lucene-analyzer-sudachi*.jar $SOLR_INSTALL_LIB_DIR/ | ||
| COPY --from=BUILD_JAR_STAGE $SUDACHI_DICT_HOME/system-dict/system.dict $SOLR_INSTALL_DIR/system.dict | ||
| COPY --from=BUILD_JAR_STAGE $SUDACHI_DICT_HOME/user_lexicon.dict $SOLR_INSTALL_DIR/user_lexicon.dict | ||
| # Copy dictionaries to /opt/solr | ||
| # See https://github.com/apache/solr-docker/blob/7e3be2fce98be1fe9c80be0727b4600d4b52fd0f/9.3/Dockerfile#L129 | ||
| COPY --from=BUILD_JAR_STAGE $SUDACHI_DICT_HOME/system-dict/system.dict $SOLR_OPT_DIR/system.dict | ||
| COPY --from=BUILD_JAR_STAGE $SUDACHI_DICT_HOME/user_lexicon.dict $SOLR_OPT_DIR/user_lexicon.dict | ||
| COPY --from=BUILD_JAR_STAGE /home/gradle/solr-lucene-analyzer-sudachi/build/libs/solr-lucene-analyzer-sudachi*.jar $SOLR_WEB_INF_LIB_HOME/ | ||
| COPY schema.xml $SOLR_SERVER_HOME/solr/configsets/_default/conf/managed-schema.xml | ||
|
|
||
| USER solr | ||