Browse Source

[fix] docker and k8s: run searx

fix #2181
Alexandre Flament 4 years ago
parent
commit
8ffede6140
2 changed files with 12 additions and 8 deletions
  1. 11 7
      dockerfiles/docker-entrypoint.sh
  2. 1 1
      docs/admin/installation-docker.rst

+ 11 - 7
dockerfiles/docker-entrypoint.sh

@@ -19,21 +19,25 @@ help() {
 	exit 0
 	exit 0
 }
 }
 
 
-if ! grep docker /proc/1/cgroup -qa; then
-    help
-fi
-
 export DEFAULT_BIND_ADDRESS="0.0.0.0:8080"
 export DEFAULT_BIND_ADDRESS="0.0.0.0:8080"
 if [ -z "${BIND_ADDRESS}" ]; then
 if [ -z "${BIND_ADDRESS}" ]; then
     export BIND_ADDRESS="${DEFAULT_BIND_ADDRESS}"
     export BIND_ADDRESS="${DEFAULT_BIND_ADDRESS}"
 fi
 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 UWSGI_SETTINGS_PATH=/etc/searx/uwsgi.ini
 export SEARX_SETTINGS_PATH=/etc/searx/settings.yml
 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
 # Parse command line
 FORCE_CONF_UPDATE=0
 FORCE_CONF_UPDATE=0
 DRY_RUN=0
 DRY_RUN=0

+ 1 - 1
docs/admin/installation-docker.rst

@@ -39,7 +39,7 @@ Command line
 
 
     docker run --rm -it searx/searx -h
     docker run --rm -it searx/searx -h
 
 
-.. program-output:: ../dockerfiles/docker-entrypoint.sh -h
+.. program-output:: ../dockerfiles/docker-entrypoint.sh help
 
 
 
 
 Build the image
 Build the image