Skip to content

Commit

Permalink
upgrade Manticore to 6.3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
akostadinov committed Dec 16, 2024
1 parent 803bfc0 commit df17e41
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
FROM quay.io/centos/centos:stream9 AS builder
ENV SEARCHD_REF=6.3.6 \
ENV SEARCHD_REF=6.3.8 \
SEARCHD_REPO=https://github.com/manticoresoftware/manticoresearch.git \
# CC=gcc-13 \
# CXX=g++-13 \
CC=clang \
CXX=clang++ \
BUILD_PATH=/tmp/manticore_uselessly_very_long_path_to_prevent_rpm_build_issues \
BUILD_FLAGS="-DUSE_SYSLOG=0 -DWITH_GALERA=0 -DWITH_RE2=0 -DWITH_STEMMER=0 -DWITH_ICU_FORCE_STATIC=0 -DWITH_SSL=1 -DWITH_ZLIB=1 -DWITH_ODBC=0 -DWITH_EXPAT=0 -DWITH_ICONV=1 -DWITH_POSTGRESQL=0 -DWITH_MYSQL=0 -DBUILD_TESTING=0 -DDISTR=rhel9"
BUILD_FLAGS="-DUSE_SYSLOG=0 -DWITH_GALERA=0 -DWITH_RE2=0 -DWITH_STEMMER=0 -DWITH_ICU_FORCE_STATIC=0 -DWITH_SSL=1 -DWITH_ZLIB=1 -DWITH_ODBC=0 -DWITH_EXPAT=0 -DWITH_ICONV=1 -DWITH_POSTGRESQL=0 -DWITH_MYSQL=0 -DBUILD_TESTING=0 -DDISTR=rhel9" \
DEPS_CLANG_RHEL9="llvm-toolset" \
DEPS_CLANG_FEDORA="llvm16-devel clang16-devel lldb" \
DEPS_GCC_RHEL9="make automake gcc gcc-c++ kernel-devel"
DEPS_GCC_FEDORA="make automake gcc13 gcc13-c++ kernel-devel"
WORKDIR $BUILD_PATH

SHELL ["/bin/bash", "-x", "-o", "pipefail", "-c"]
# clang is broken on s390x (RHEL-15874), to use gcc remove CC and CXX variables,
# also replace llvm-toolset with make automake gcc gcc-c++ kernel-devel
# clang might be broken on s390x (RHEL-15874), to use gcc remove or adjust CC and CXX variables
# hadolint ignore=DL3003,DL3032,SC2046
RUN yum install -y --setopt=skip_missing_names_on_install=False,tsflags=nodocs llvm-toolset mysql cmake boost-devel openssl-devel zlib-devel libicu-devel bison flex systemd-units rpm-build git && \
RUN dnf install -y --setopt=strict=True --setopt=tsflags=nodocs $DEPS_CLANG_RHEL9 mysql cmake boost-devel openssl-devel zlib-devel libicu-devel bison flex systemd-units rpm-build git && \
git clone --depth=1 --branch=$SEARCHD_REF $SEARCHD_REPO . && \
# boost lib in RHEL9 comes dynamic only so enable its use \
sed -i -e 's/Boost_USE_STATIC_LIBS ON/Boost_USE_STATIC_LIBS OFF/' src/CMakeLists.txt && \
Expand Down Expand Up @@ -57,5 +62,5 @@ RUN microdnf install -y --nodocs mysql openssl boost-context boost-filesystem zl
chgrp 0 /var/lib/searchd /var/run/manticore /var/log/manticore

WORKDIR /var/lib/manticore
ENTRYPOINT ["/bin/env", "searchd", "--pidfile", "--config", "/etc/manticoresearch/manticore.conf", "--nodetach"]
ENTRYPOINT ["/bin/searchd", "--pidfile", "--config", "/etc/manticoresearch/manticore.conf", "--nodetach"]
EXPOSE 9306/tcp

0 comments on commit df17e41

Please sign in to comment.