Changed sphinxsearch config path, added environment variables for def…

…ault and max search count.

Dockerfile

@@ -9,11 +9,9 @@ RUN apt-get -qq update && apt-get install -qq -y --no-install-recommends \
     nginx \
     python \
     python-setuptools \
-    python-shapely \
     python-pip \
     python-crypto \
     python-flask \
-    python-shapely \
     python-pil \
     unixodbc \
     uwsgi \
@@ -29,15 +27,17 @@ RUN curl -s \
 && mkdir -p /var/log/sphinx \
 && mkdir -p /var/log/supervisord
 
-COPY conf/sphinx/*.conf /etc/sphinx/
+COPY conf/sphinx/*.conf /etc/sphinxsearch/
 COPY conf/nginx/nginx.conf /etc/nginx/sites-available/default
 COPY supervisor/*.conf /etc/supervisor/conf.d/
 COPY supervisord.conf /etc/supervisor/supervisord.conf
 COPY web /usr/local/src/websearch
 COPY sample.tsv /
 COPY sphinx-reindex.sh /
 
-ENV SPHINX_PORT 9312
+ENV SPHINX_PORT=9312 \
+    SEARCH_MAX_COUNT=100 \
+    SEARCH_DEFAULT_COUNT=20
 
 EXPOSE 80
 CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

sphinx-reindex.sh

@@ -8,7 +8,7 @@ fi
 # Index files, only if not exists
 if [ ! -f /data/index/ind_name.spa ]; then
     mkdir -p /data/index/
-    /usr/bin/indexer -c /etc/sphinx/sphinx.conf --rotate --all
+    /usr/bin/indexer -c /etc/sphinxsearch/sphinx.conf --rotate --all
 fi
 
 # Start sphinx job in supervisor

supervisor/sphinx.conf

@@ -7,7 +7,7 @@ redirect_stderr=true
 priority=1
 
 [program:sphinx]
-command=/usr/bin/searchd --nodetach -c /etc/sphinx/sphinx.conf
+command=/usr/bin/searchd --nodetach -c /etc/sphinxsearch/sphinx.conf
 autostart=false
 autorestart=true
 user=root