Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 7 additions & 34 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@ https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/ma
https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-dev_17.5.1-26020616-d4cc0969e_all.deb \
https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-icudata-65l.deb \
https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-load_1.24.0+25122422-e5db1c82_all.deb \
https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-language-packs_1.0.13-250708-1e9c2cd_all.deb \
https://repo.manticoresearch.com/repository/manticoresearch_jammy_release_candidate/dists/jammy/main/binary-_ARCH_64/manticore-language-packs_1.0.15-260430-eadde16_all.deb \
https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-tzdata_1.0.1-250708-4dfa71e_all.deb \
https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-executor_1.4.0+26012715-d7a66c60__ARCH_64.deb \
https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-galera_3.37__ARCH_64.deb \
https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-columnar-lib_10.2.0+26020513-9a5dd2f5__ARCH_64.deb \
https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-lemmatizer-uk_1.0.3__ARCH_64.deb"}
https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-columnar-lib_10.2.0+26020513-9a5dd2f5__ARCH_64.deb"}
# TODO: add manticore-load to the next release

RUN if [ -z "$DAEMON_URL" ] ; then \
Expand Down Expand Up @@ -72,7 +71,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then export ARCH="arm"; else expo
&& dpkg -i manticore-dev-repo.noarch.deb \
&& sed -i 's|http://repo.manticoresearch.com|https://repo.manticoresearch.com|g' /etc/apt/sources.list.d/*.list \
&& apt-key adv --fetch-keys 'https://repo.manticoresearch.com/GPG-KEY-manticore' && apt-get -y update \
&& apt-get -y install manticore-server manticore-tools manticore-dev manticore-icudata-65l manticore-buddy manticore-extra manticore-load manticore-lemmatizer-uk manticore-language-packs;\
&& apt-get -y install manticore-server manticore-tools manticore-dev manticore-icudata-65l manticore-buddy manticore-extra manticore-load manticore-language-packs;\
elif [ ! -z "$DAEMON_URL" ]; then \
echo "2nd step of building release image for linux/${ARCH}64 architecture" \
&& echo "ARCH: ${ARCH}" \
Expand All @@ -81,42 +80,17 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then export ARCH="arm"; else expo
&& apt-get -y install ./manticore*deb \
&& rm *.deb ; \
fi
RUN if [ -d "/packages/" ]; then apt -y install /packages/*deb; fi \
RUN set -eux \
&& if [ -d "/packages/" ]; then apt -y install /packages/*deb; fi \
&& mkdir -p /var/run/manticore \
&& mkdir /docker-entrypoint-initdb.d \
&& apt-get -y purge --auto-remove \
&& rm -rf /var/lib/apt/lists/* \
&& rm -fr /packages \
&& rm -f /usr/bin/spelldump /usr/bin/wordbreaker \
&& mkdir -p /var/run/mysqld/ \
&& chown -R manticore:manticore /docker-entrypoint-initdb.d /var/lib/manticore/ /var/run/mysqld/ /usr/share/manticore/ \
/usr/share/manticore/modules/ /usr/share/doc/manticore-galera/ /var/run/manticore \
&& echo "\n[mysql]\nsilent\nwait\ntable\n" >> /etc/mysql/my.cnf \
&& wget -q https://repo.manticoresearch.com/repository/morphology/en.pak.tgz?docker_build=1 -O /tmp/en.pak.tgz \
&& wget -q https://repo.manticoresearch.com/repository/morphology/de.pak.tgz?docker_build=1 -O /tmp/de.pak.tgz \
&& wget -q https://repo.manticoresearch.com/repository/morphology/ru.pak.tgz?docker_build=1 -O /tmp/ru.pak.tgz \
&& tar -xf /tmp/en.pak.tgz -C /usr/share/manticore/ \
&& tar -xf /tmp/de.pak.tgz -C /usr/share/manticore/ \
&& tar -xf /tmp/ru.pak.tgz -C /usr/share/manticore/ \
&& rm /tmp/*.pak.tgz

# Install Python deps needed for Ukrainian morphology (lemmatize_uk).
# Keep it minimal (avoid `python3.9-dev`) and pin/upgrade `cryptography` to avoid HIGH CVEs.
RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends software-properties-common ca-certificates; \
add-apt-repository -y ppa:deadsnakes/ppa; \
apt-get update; \
apt-get install -y --no-install-recommends python3.9 python3.9-distutils python3.9-venv libpython3.9; \
if dpkg -s python3-cryptography >/dev/null 2>&1; then apt-get purge -y --auto-remove python3-cryptography; fi; \
apt-get purge -y --auto-remove software-properties-common; \
python3.9 -m ensurepip --upgrade; \
python3.9 -m pip install --no-cache-dir --upgrade pip setuptools wheel; \
python3.9 -m pip install --no-cache-dir pymorphy2 pymorphy2-dicts-uk; \
python3.9 -m pip install --no-cache-dir --upgrade "cryptography>=43.0.1"; \
python3.9 -m pip check; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*
&& chown -R manticore:manticore /docker-entrypoint-initdb.d /var/lib/manticore/ /var/run/mysqld/ /var/run/manticore \
&& echo "\n[mysql]\nsilent\nwait\ntable\n" >> /etc/mysql/my.cnf

COPY manticore.conf.sh /etc/manticoresearch/
RUN sed -i '/log = \/var\/log\/manticore\/searchd.log/d;/query_log = \/var\/log\/manticore\/query.log/d' /etc/manticoresearch/manticore.conf
Expand All @@ -140,7 +114,6 @@ EXPOSE 9308
EXPOSE 9312
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV PYTHONWARNINGS "ignore::UserWarning:pymorphy2.analyzer"
ENV MANTICORE_CONFIG "/etc/manticoresearch/manticore.conf.sh|/etc/manticoresearch/manticore.conf"
CMD ["searchd", "-c", "/etc/manticoresearch/manticore.conf.sh", "--nodetach"]

Expand Down
24 changes: 24 additions & 0 deletions clt_tests/tests/test-ukrainian-morphology.rec
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,30 @@ if timeout 5 grep -qm1 'accepting connections' <(docker logs -f manticore); then
––– output –––
accepting connections
––– input –––
docker exec manticore sh -c 'test -f /usr/share/manticore/uk.pak && echo "uk.pak present"'
––– output –––
uk.pak present
––– input –––
docker exec manticore sh -c 'dpkg -L manticore-language-packs | grep -Fx /usr/share/manticore/uk.pak'
––– output –––
/usr/share/manticore/uk.pak
––– input –––
docker exec manticore sh -c '! dpkg -s manticore-lemmatizer-uk >/dev/null 2>&1 && echo "manticore-lemmatizer-uk absent"'
––– output –––
manticore-lemmatizer-uk absent
––– input –––
docker exec manticore sh -c 'test ! -e /usr/local/lib/manticore/lemmatize_uk.so && echo "legacy lemmatize_uk plugin absent"'
––– output –––
legacy lemmatize_uk plugin absent
––– input –––
docker exec manticore sh -c 'if find /usr/local/lib /usr/lib \( -iname "*pymorphy2*" -o -iname "*pymorphy2-dicts-uk*" -o -iname "*pymorphy2_dicts_uk*" \) 2>/dev/null | grep -q .; then exit 1; else echo "pymorphy2 packages absent"; fi'
––– output –––
pymorphy2 packages absent
––– input –––
docker exec manticore sh -c '! command -v python3.9 >/dev/null 2>&1 && echo "python3.9 absent"'
––– output –––
python3.9 absent
––– input –––
docker exec manticore mysql -h0 -P9306 -e "CREATE TABLE test_uk (id bigint, content text) rt_mem_limit = '256M' morphology = 'lemmatize_uk' charset_table = '0..9, A..Z->a..z, _, a..z, U+0410..U+042F->U+0430..U+044F, U+0430..U+044F, U+0454, U+0456, U+0457, U+0491';"
––– output –––
––– input –––
Expand Down
Loading