diff options
| -rw-r--r-- | Dockerfile | 1 | ||||
| -rwxr-xr-x | dockerfiles/docker-entrypoint.sh | 11 | ||||
| -rw-r--r-- | dockerfiles/uwsgi.ini | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Dockerfile b/Dockerfile index b353db102..1e2d8a227 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN addgroup -g ${SEARXNG_GID} searxng && \ ENV INSTANCE_NAME=searxng \ AUTOCOMPLETE= \ BASE_URL= \ + BIND_ADDRESS=[::]:8080 \ MORTY_KEY= \ MORTY_URL= \ SEARXNG_SETTINGS_PATH=/etc/searxng/settings.yml \ diff --git a/dockerfiles/docker-entrypoint.sh b/dockerfiles/docker-entrypoint.sh index ade9b6836..771780bb8 100755 --- a/dockerfiles/docker-entrypoint.sh +++ b/dockerfiles/docker-entrypoint.sh @@ -14,8 +14,6 @@ Environment variables: BASE_URL settings.yml : server.base_url MORTY_URL settings.yml : result_proxy.url MORTY_KEY settings.yml : result_proxy.key - BIND_ADDRESS uwsgi bind to the specified TCP socket using HTTP protocol. - Default value: ${DEFAULT_BIND_ADDRESS} Volume: /etc/searxng the docker entry point copies settings.yml and uwsgi.ini in this directory (see the -f command line option)" @@ -23,9 +21,6 @@ Volume: EOF } -export DEFAULT_BIND_ADDRESS="[::]:8080" -export BIND_ADDRESS="${BIND_ADDRESS:-${DEFAULT_BIND_ADDRESS}}" - # Parse command line FORCE_CONF_UPDATE=0 DRY_RUN=0 @@ -173,6 +168,8 @@ fi unset MORTY_KEY -# Start uwsgi printf 'Listen on %s\n' "${BIND_ADDRESS}" -exec uwsgi --master --uid searxng --gid searxng --http-socket "${BIND_ADDRESS}" "${UWSGI_SETTINGS_PATH}" + +# Start uwsgi +# TODO: "--http-socket" will be removed in the future (see uwsgi.ini.new config file): https://github.com/searxng/searxng/pull/4578 +exec uwsgi --http-socket "${BIND_ADDRESS}" "${UWSGI_SETTINGS_PATH}" diff --git a/dockerfiles/uwsgi.ini b/dockerfiles/uwsgi.ini index f1309ca89..dfde9109a 100644 --- a/dockerfiles/uwsgi.ini +++ b/dockerfiles/uwsgi.ini @@ -1,4 +1,8 @@ [uwsgi] +# Listening address +# default value: [::]:8080 (see Dockerfile) +http-socket = $(BIND_ADDRESS) + # Who will run the code uid = searxng gid = searxng |