on master help sign in
[fix] docker and k8s: run searx

fix #2181

commit8ffede6140ccf60933506c18444e315840ac2829 authorAlexandre Flament <alex@al-f.net> dateWed 9 Sep 2020, 10:28 (6 years ago) parent7e82817
2 files changed+12−8
dockerfiles/docker-entrypoint.sh+11−7 docs/admin/installation-docker.rst+1−1
dockerfiles/docker-entrypoint.sh+11−7
@@ -19,21 +19,25 @@ help() {
1919 exit 0
2020}
2121
22−if ! grep docker /proc/1/cgroup -qa; then
23− help
24−fi
25−
2622export DEFAULT_BIND_ADDRESS="0.0.0.0:8080"
2723if [ -z "${BIND_ADDRESS}" ]; then
2824 export BIND_ADDRESS="${DEFAULT_BIND_ADDRESS}"
2925fi
3026
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−
3427export UWSGI_SETTINGS_PATH=/etc/searx/uwsgi.ini
3528export SEARX_SETTINGS_PATH=/etc/searx/settings.yml
3629
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+
3741# Parse command line
3842FORCE_CONF_UPDATE=0
3943DRY_RUN=0
docs/admin/installation-docker.rst+1−1
@@ -39,7 +39,7 @@ Command line
3939
4040 docker run --rm -it searx/searx -h
4141
42−.. program-output:: ../dockerfiles/docker-entrypoint.sh -h
42+.. program-output:: ../dockerfiles/docker-entrypoint.sh help
4343
4444
4545Build the image