git.iko.soy/searx
on master help sign in
Allow overriding env vars SEARX_SETTINGS_PATH,UWSGI_SETTINGS_PATH
0fb423e3nprob
Dockerfile+3−1
compare with master
unifiedsplit
@@ -14,7 +14,9 @@ ENV INSTANCE_NAME=searx \
14 AUTOCOMPLETE= \
14 AUTOCOMPLETE= \
15 BASE_URL= \
15 BASE_URL= \
16 MORTY_KEY= \
16 MORTY_KEY= \
17− MORTY_URL=
17+ MORTY_URL= \
18+ SEARX_SETTINGS_PATH=/etc/searx/settings.yml \
19+ UWSGI_SETTINGS_PATH=/etc/searx/uwsgi.ini
18
20
19WORKDIR /usr/local/searx
21WORKDIR /usr/local/searx
20
22
dockerfiles/docker-entrypoint.sh−3
@@ -24,9 +24,6 @@ if [ -z "${BIND_ADDRESS}" ]; then
24 export BIND_ADDRESS="${DEFAULT_BIND_ADDRESS}"
24 export BIND_ADDRESS="${DEFAULT_BIND_ADDRESS}"
25fi
25fi
26
26
27−export UWSGI_SETTINGS_PATH=/etc/searx/uwsgi.ini
28−export SEARX_SETTINGS_PATH=/etc/searx/settings.yml
29−
30# Parse special command line
27# Parse special command line
31# see docs/admin/installation-docker.rst
28# see docs/admin/installation-docker.rst
32# display the help message without the version
29# display the help message without the version
utils/searx.sh+1−1
@@ -35,7 +35,7 @@ SERVICE_GROUP="${SERVICE_USER}"
35GIT_BRANCH="${GIT_BRANCH:-master}"
35GIT_BRANCH="${GIT_BRANCH:-master}"
36SEARX_PYENV="${SERVICE_HOME}/searx-pyenv"
36SEARX_PYENV="${SERVICE_HOME}/searx-pyenv"
37SEARX_SRC="${SERVICE_HOME}/searx-src"
37SEARX_SRC="${SERVICE_HOME}/searx-src"
38−SEARX_SETTINGS_PATH="/etc/searx/settings.yml"
38+SEARX_SETTINGS_PATH="${SEARX_SETTINGS_PATH:-/etc/searx/settings.yml}"
39SEARX_SETTINGS_TEMPLATE="${SEARX_SETTINGS_TEMPLATE:-${REPO_ROOT}/utils/templates/etc/searx/use_default_settings.yml}"
39SEARX_SETTINGS_TEMPLATE="${SEARX_SETTINGS_TEMPLATE:-${REPO_ROOT}/utils/templates/etc/searx/use_default_settings.yml}"
40SEARX_UWSGI_APP="searx.ini"
40SEARX_UWSGI_APP="searx.ini"
41# shellcheck disable=SC2034
41# shellcheck disable=SC2034