git.iko.soy/searx
on master help sign in
[fix] docker and k8s: run searx
8ffede6Alexandre Flament
dockerfiles/docker-entrypoint.sh+11−7
compare with master
unifiedsplit
@@ -19,21 +19,25 @@ help() {
19 exit 0
19 exit 0
20}
20}
21
21
22−if ! grep docker /proc/1/cgroup -qa; then
23− help
24−fi
25−
26export DEFAULT_BIND_ADDRESS="0.0.0.0:8080"
22export DEFAULT_BIND_ADDRESS="0.0.0.0:8080"
27if [ -z "${BIND_ADDRESS}" ]; then
23if [ -z "${BIND_ADDRESS}" ]; then
28 export BIND_ADDRESS="${DEFAULT_BIND_ADDRESS}"
24 export BIND_ADDRESS="${DEFAULT_BIND_ADDRESS}"
29fi
25fi
30
26
31−export SEARX_VERSION=$(su searx -c 'python3 -c "import six; import searx.version; six.print_(searx.version.VERSION_STRING)"' 2>/dev/null)
32−printf 'searx version %s\n\n' "${SEARX_VERSION}"
33−
34export UWSGI_SETTINGS_PATH=/etc/searx/uwsgi.ini
27export UWSGI_SETTINGS_PATH=/etc/searx/uwsgi.ini
35export SEARX_SETTINGS_PATH=/etc/searx/settings.yml
28export SEARX_SETTINGS_PATH=/etc/searx/settings.yml
36
29
30+# Parse special command line
31+# see docs/admin/installation-docker.rst
32+# display the help message without the version
33+if [ "$1" = "help" ]; then
34+ help
35+fi
36+
37+# Version
38+export SEARX_VERSION=$(su searx -c 'python3 -c "import six; import searx.version; six.print_(searx.version.VERSION_STRING)"' 2>/dev/null)
39+printf 'searx version %s\n\n' "${SEARX_VERSION}"
40+
37# Parse command line
41# Parse command line
38FORCE_CONF_UPDATE=0
42FORCE_CONF_UPDATE=0
39DRY_RUN=0
43DRY_RUN=0
docs/admin/installation-docker.rst+1−1
@@ -39,7 +39,7 @@ Command line
39
39
40 docker run --rm -it searx/searx -h
40 docker run --rm -it searx/searx -h
41
41
42−.. program-output:: ../dockerfiles/docker-entrypoint.sh -h
42+.. program-output:: ../dockerfiles/docker-entrypoint.sh help
43
43
44
44
45Build the image
45Build the image