diff options
| author | Ivan Gabaldon <igabaldon@inetol.net> | 2025-05-06 11:56:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-06 11:56:59 +0200 |
| commit | a2fa7de880a06bada1e3a281d2e3652999cd20dd (patch) | |
| tree | 75ef3af0363358c047d3d7c1234f6174e61931f2 /dockerfiles | |
| parent | 0315988f5ab9d5d55693bc9a0eca045bf9220506 (diff) | |
[mod] Rework Dockerfile - migrate to glibc (debian) (#4721)
Diffstat (limited to 'dockerfiles')
| -rwxr-xr-x | dockerfiles/docker-entrypoint.sh | 14 | ||||
| -rw-r--r-- | dockerfiles/uwsgi.ini | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/dockerfiles/docker-entrypoint.sh b/dockerfiles/docker-entrypoint.sh index 771780bb8..3668fb589 100755 --- a/dockerfiles/docker-entrypoint.sh +++ b/dockerfiles/docker-entrypoint.sh @@ -43,15 +43,7 @@ do esac done -get_searxng_version(){ - su searxng -c \ - 'python3 -c "import six; import searx.version; six.print_(searx.version.VERSION_STRING)"' \ - 2>/dev/null -} - -SEARXNG_VERSION="$(get_searxng_version)" -export SEARXNG_VERSION -echo "SearXNG version ${SEARXNG_VERSION}" +echo "SearXNG version $SEARXNG_VERSION" # helpers to update the configuration files patch_uwsgi_settings() { @@ -76,7 +68,7 @@ patch_searxng_settings() { -e "s|base_url: false|base_url: ${BASE_URL}|g" \ -e "s/instance_name: \"SearXNG\"/instance_name: \"${INSTANCE_NAME}\"/g" \ -e "s/autocomplete: \"\"/autocomplete: \"${AUTOCOMPLETE}\"/g" \ - -e "s/ultrasecretkey/$(openssl rand -hex 32)/g" \ + -e "s/ultrasecretkey/$(head -c 24 /dev/urandom | base64 | tr -dc 'a-zA-Z0-9')/g" \ "${CONF}" # Morty configuration @@ -172,4 +164,4 @@ printf 'Listen on %s\n' "${BIND_ADDRESS}" # 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}" +exec /usr/local/searxng/venv/bin/uwsgi --http-socket "${BIND_ADDRESS}" "${UWSGI_SETTINGS_PATH}" diff --git a/dockerfiles/uwsgi.ini b/dockerfiles/uwsgi.ini index dfde9109a..3bfd49e72 100644 --- a/dockerfiles/uwsgi.ini +++ b/dockerfiles/uwsgi.ini @@ -21,7 +21,6 @@ chmod-socket = 666 # Plugin to use and interpreter config single-interpreter = true master = true -plugin = python3 lazy-apps = true enable-threads = true |