summaryrefslogtreecommitdiff
path: root/dockerfiles
diff options
context:
space:
mode:
authorIvan Gabaldon <igabaldon@inetol.net>2025-05-11 18:12:51 +0200
committerGitHub <noreply@github.com>2025-05-11 18:12:51 +0200
commitd16854e67a5bf2f640aabf119c9b50f5a1a3f24f (patch)
tree3c60e7f7fced18e5ff79f60e41968ab8e5dd2c88 /dockerfiles
parent1b787ed35e9c51e335c42faee1f76695780ba4cb (diff)
[mod] rework container deployment (#4764)
container.yml will run after integration.yml COMPLETES successfully and in master branch. Style changes, cleanup and improved integration with CI by leveraging the use of shared cache between all workflows. * Podman is now supported to build the container images (Docker also received a refactor, merging both build and buildx) * Container images are being built by Buildah instead of Docker BuildKit. * Container images are tested before release. * Splitting "modern" (amd64 & arm64) and "legacy" (armv7) arches on different Dockerfiles allowing future optimizations.
Diffstat (limited to 'dockerfiles')
-rwxr-xr-xdockerfiles/docker-entrypoint.sh167
-rw-r--r--dockerfiles/uwsgi.ini55
2 files changed, 0 insertions, 222 deletions
diff --git a/dockerfiles/docker-entrypoint.sh b/dockerfiles/docker-entrypoint.sh
deleted file mode 100755
index 3668fb589..000000000
--- a/dockerfiles/docker-entrypoint.sh
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-
-help() {
- cat <<EOF
-Command line:
- -h Display this help
- -d Dry run to update the configuration files.
- -f Always update on the configuration files (existing files are renamed with
- the .old suffix). Without this option, the new configuration files are
- copied with the .new suffix
-Environment variables:
- INSTANCE_NAME settings.yml : general.instance_name
- AUTOCOMPLETE settings.yml : search.autocomplete
- BASE_URL settings.yml : server.base_url
- MORTY_URL settings.yml : result_proxy.url
- MORTY_KEY settings.yml : result_proxy.key
-Volume:
- /etc/searxng the docker entry point copies settings.yml and uwsgi.ini in
- this directory (see the -f command line option)"
-
-EOF
-}
-
-# Parse command line
-FORCE_CONF_UPDATE=0
-DRY_RUN=0
-
-while getopts "fdh" option
-do
- case $option in
-
- f) FORCE_CONF_UPDATE=1 ;;
- d) DRY_RUN=1 ;;
-
- h)
- help
- exit 0
- ;;
- *)
- echo "unknow option ${option}"
- exit 42
- ;;
- esac
-done
-
-echo "SearXNG version $SEARXNG_VERSION"
-
-# helpers to update the configuration files
-patch_uwsgi_settings() {
- CONF="$1"
-
- # update uwsg.ini
- sed -i \
- -e "s|workers = .*|workers = ${UWSGI_WORKERS:-%k}|g" \
- -e "s|threads = .*|threads = ${UWSGI_THREADS:-4}|g" \
- "${CONF}"
-}
-
-patch_searxng_settings() {
- CONF="$1"
-
- # Make sure that there is trailing slash at the end of BASE_URL
- # see https://www.gnu.org/savannah-checkouts/gnu/bash/manual/bash.html#Shell-Parameter-Expansion
- export BASE_URL="${BASE_URL%/}/"
-
- # update settings.yml
- sed -i \
- -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/$(head -c 24 /dev/urandom | base64 | tr -dc 'a-zA-Z0-9')/g" \
- "${CONF}"
-
- # Morty configuration
-
- if [ -n "${MORTY_KEY}" ] && [ -n "${MORTY_URL}" ]; then
- sed -i -e "s/image_proxy: false/image_proxy: true/g" \
- "${CONF}"
- cat >> "${CONF}" <<-EOF
-
-# Morty configuration
-result_proxy:
- url: ${MORTY_URL}
- key: !!binary "${MORTY_KEY}"
-EOF
- fi
-}
-
-update_conf() {
- FORCE_CONF_UPDATE=$1
- CONF="$2"
- NEW_CONF="${2}.new"
- OLD_CONF="${2}.old"
- REF_CONF="$3"
- PATCH_REF_CONF="$4"
-
- if [ -f "${CONF}" ]; then
- if [ "${REF_CONF}" -nt "${CONF}" ]; then
- # There is a new version
- if [ "$FORCE_CONF_UPDATE" -ne 0 ]; then
- # Replace the current configuration
- printf '⚠️ Automatically update %s to the new version\n' "${CONF}"
- if [ ! -f "${OLD_CONF}" ]; then
- printf 'The previous configuration is saved to %s\n' "${OLD_CONF}"
- mv "${CONF}" "${OLD_CONF}"
- fi
- cp "${REF_CONF}" "${CONF}"
- $PATCH_REF_CONF "${CONF}"
- else
- # Keep the current configuration
- printf '⚠️ Check new version %s to make sure SearXNG is working properly\n' "${NEW_CONF}"
- cp "${REF_CONF}" "${NEW_CONF}"
- $PATCH_REF_CONF "${NEW_CONF}"
- fi
- else
- printf 'Use existing %s\n' "${CONF}"
- fi
- else
- printf 'Create %s\n' "${CONF}"
- cp "${REF_CONF}" "${CONF}"
- $PATCH_REF_CONF "${CONF}"
- fi
-}
-
-# searx compatibility: copy /etc/searx/* to /etc/searxng/*
-SEARX_CONF=0
-if [ -f "/etc/searx/settings.yml" ]; then
- if [ ! -f "${SEARXNG_SETTINGS_PATH}" ]; then
- printf '⚠️ /etc/searx/settings.yml is copied to /etc/searxng\n'
- cp "/etc/searx/settings.yml" "${SEARXNG_SETTINGS_PATH}"
- fi
- SEARX_CONF=1
-fi
-if [ -f "/etc/searx/uwsgi.ini" ]; then
- printf '⚠️ /etc/searx/uwsgi.ini is ignored. Use the volume /etc/searxng\n'
- SEARX_CONF=1
-fi
-if [ "$SEARX_CONF" -eq "1" ]; then
- printf '⚠️ The deprecated volume /etc/searx is mounted. Please update your configuration to use /etc/searxng ⚠️\n'
- cat << EOF > /etc/searx/deprecated_volume_read_me.txt
-This Docker image uses the volume /etc/searxng
-Update your configuration:
-* remove uwsgi.ini (or very carefully update your existing uwsgi.ini using https://github.com/searxng/searxng/blob/master/dockerfiles/uwsgi.ini )
-* mount /etc/searxng instead of /etc/searx
-EOF
-fi
-# end of searx compatibility
-
-# make sure there are uwsgi settings
-update_conf "${FORCE_CONF_UPDATE}" "${UWSGI_SETTINGS_PATH}" "/usr/local/searxng/dockerfiles/uwsgi.ini" "patch_uwsgi_settings"
-
-# make sure there are searxng settings
-update_conf "${FORCE_CONF_UPDATE}" "${SEARXNG_SETTINGS_PATH}" "/usr/local/searxng/searx/settings.yml" "patch_searxng_settings"
-
-# dry run (to update configuration files, then inspect them)
-if [ $DRY_RUN -eq 1 ]; then
- printf 'Dry run\n'
- exit
-fi
-
-unset MORTY_KEY
-
-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 /usr/local/searxng/venv/bin/uwsgi --http-socket "${BIND_ADDRESS}" "${UWSGI_SETTINGS_PATH}"
diff --git a/dockerfiles/uwsgi.ini b/dockerfiles/uwsgi.ini
deleted file mode 100644
index 3bfd49e72..000000000
--- a/dockerfiles/uwsgi.ini
+++ /dev/null
@@ -1,55 +0,0 @@
-[uwsgi]
-# Listening address
-# default value: [::]:8080 (see Dockerfile)
-http-socket = $(BIND_ADDRESS)
-
-# Who will run the code
-uid = searxng
-gid = searxng
-
-# Number of workers (usually CPU count)
-# default value: %k (= number of CPU core, see Dockerfile)
-workers = $(UWSGI_WORKERS)
-
-# Number of threads per worker
-# default value: 4 (see Dockerfile)
-threads = $(UWSGI_THREADS)
-
-# The right granted on the created socket
-chmod-socket = 666
-
-# Plugin to use and interpreter config
-single-interpreter = true
-master = true
-lazy-apps = true
-enable-threads = true
-
-# Module to import
-module = searx.webapp
-
-# Virtualenv and python path
-pythonpath = /usr/local/searxng/
-chdir = /usr/local/searxng/searx/
-
-# automatically set processes name to something meaningful
-auto-procname = true
-
-# Disable request logging for privacy
-disable-logging = true
-log-5xx = true
-
-# Set the max size of a request (request-body excluded)
-buffer-size = 8192
-
-# No keep alive
-# See https://github.com/searx/searx-docker/issues/24
-add-header = Connection: close
-
-# Follow SIGTERM convention
-# See https://github.com/searxng/searxng/issues/3427
-die-on-term
-
-# uwsgi serves the static files
-static-map = /static=/usr/local/searxng/searx/static
-static-gzip-all = True
-offload-threads = %k