diff options
| author | Alexandre Flament <alex@al-f.net> | 2020-09-09 10:28:17 +0200 |
|---|---|---|
| committer | Alexandre Flament <alex@al-f.net> | 2020-09-10 10:07:49 +0200 |
| commit | 8ffede6140ccf60933506c18444e315840ac2829 (patch) | |
| tree | 30238d5dbe5e206c5733a115a9028790f49dffa0 | |
| parent | 7e8281792586c43c72caab4f1d484323063d6657 (diff) | |
| download | searxng-8ffede6140ccf60933506c18444e315840ac2829.tar.gz searxng-8ffede6140ccf60933506c18444e315840ac2829.zip | |
[fix] docker and k8s: run searx
fix #2181
| -rwxr-xr-x | dockerfiles/docker-entrypoint.sh | 18 | ||||
| -rw-r--r-- | docs/admin/installation-docker.rst | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/dockerfiles/docker-entrypoint.sh b/dockerfiles/docker-entrypoint.sh index 2ea2f051b..a8f18f05b 100755 --- a/dockerfiles/docker-entrypoint.sh +++ b/dockerfiles/docker-entrypoint.sh @@ -19,21 +19,25 @@ help() { exit 0 } -if ! grep docker /proc/1/cgroup -qa; then - help -fi - export DEFAULT_BIND_ADDRESS="0.0.0.0:8080" if [ -z "${BIND_ADDRESS}" ]; then export BIND_ADDRESS="${DEFAULT_BIND_ADDRESS}" fi -export SEARX_VERSION=$(su searx -c 'python3 -c "import six; import searx.version; six.print_(searx.version.VERSION_STRING)"' 2>/dev/null) -printf 'searx version %s\n\n' "${SEARX_VERSION}" - export UWSGI_SETTINGS_PATH=/etc/searx/uwsgi.ini export SEARX_SETTINGS_PATH=/etc/searx/settings.yml +# Parse special command line +# see docs/admin/installation-docker.rst +# display the help message without the version +if [ "$1" = "help" ]; then + help +fi + +# Version +export SEARX_VERSION=$(su searx -c 'python3 -c "import six; import searx.version; six.print_(searx.version.VERSION_STRING)"' 2>/dev/null) +printf 'searx version %s\n\n' "${SEARX_VERSION}" + # Parse command line FORCE_CONF_UPDATE=0 DRY_RUN=0 diff --git a/docs/admin/installation-docker.rst b/docs/admin/installation-docker.rst index 9510ded09..b30cdcbd0 100644 --- a/docs/admin/installation-docker.rst +++ b/docs/admin/installation-docker.rst @@ -39,7 +39,7 @@ Command line docker run --rm -it searx/searx -h -.. program-output:: ../dockerfiles/docker-entrypoint.sh -h +.. program-output:: ../dockerfiles/docker-entrypoint.sh help Build the image |