[enh] container: build with uv (#5199)

This commit replaces `pip` in container builds with `uv` pip compat
with a 1:1 parity. The only thing that changes is the installation speed of the
wheels, which seems to be considerably faster, although I haven't been able to
properly quantify this yet.

uv also gives us more tools to manage the cache. We can revert the prior cache
changes in `container.yml` as we won't have duplicated wheels anymore.
This commit is contained in:
Ivan Gabaldon 2025-09-14 10:36:21 +02:00 committed by GitHub
parent 687121d584
commit a0d2ecf434
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 46 additions and 67 deletions

View File

@ -104,8 +104,6 @@ jobs:
needs: build-base needs: build-base
strategy: strategy:
fail-fast: false fail-fast: false
# Faster runners first to cache arch independent wheels
max-parallel: 1
matrix: matrix:
include: include:
- arch: amd64 - arch: amd64
@ -121,8 +119,6 @@ jobs:
permissions: permissions:
# Organization GHCR # Organization GHCR
packages: write packages: write
# Clean key cache step
actions: write
outputs: outputs:
docker_tag: ${{ steps.build.outputs.docker_tag }} docker_tag: ${{ steps.build.outputs.docker_tag }}
@ -146,23 +142,12 @@ jobs:
restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-" restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-"
path: "./local/" path: "./local/"
- name: Restore cache container mounts - name: Setup cache container uv
id: cache-container-mounts uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
with: with:
key: "container-mounts-${{ hashFiles('./container/*.dockerfile') }}" key: "container-uv-${{ matrix.arch }}-${{ hashFiles('./requirements*.txt') }}"
restore-keys: "container-mounts-" restore-keys: "container-uv-${{ matrix.arch }}-"
path: | path: "/var/tmp/buildah-cache-1001/uv/"
/var/tmp/buildah-cache/
/var/tmp/buildah-cache-*/
# https://github.com/actions/cache/pull/1308
- if: steps.cache-container-mounts.outputs.cache-hit == 'true'
name: Clean key cache container mounts
continue-on-error: true
env:
GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
run: gh cache delete container-mounts-${{ hashFiles('./container/*.dockerfile') }}
- if: ${{ matrix.emulation }} - if: ${{ matrix.emulation }}
name: Setup QEMU name: Setup QEMU
@ -181,15 +166,6 @@ jobs:
OVERRIDE_ARCH: "${{ matrix.arch }}" OVERRIDE_ARCH: "${{ matrix.arch }}"
run: make podman.build run: make podman.build
- if: always()
name: Save cache container mounts
uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
with:
key: "container-mounts-${{ hashFiles('./container/*.dockerfile') }}"
path: |
/var/tmp/buildah-cache/
/var/tmp/buildah-cache-*/
test: test:
name: Test (${{ matrix.arch }}) name: Test (${{ matrix.arch }})
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}

View File

@ -6,7 +6,7 @@ contents:
- alpine-base - alpine-base
- build-base - build-base
- python3-dev - python3-dev
- py3-pip - uv
- brotli - brotli
entrypoint: entrypoint:

View File

@ -2,10 +2,13 @@ FROM ghcr.io/searxng/base:searxng-builder AS builder
COPY ./requirements*.txt ./ COPY ./requirements*.txt ./
RUN --mount=type=cache,id=pip,target=/root/.cache/pip set -eux; \ ARG TIMESTAMP="0"
python -m venv ./.venv/; \
. ./.venv/bin/activate; \ RUN --mount=type=cache,id=uv,target=/root/.cache/uv set -eux; \
pip install -r ./requirements.txt -r ./requirements-server.txt uv venv; \
uv pip install --no-managed-python --compile-bytecode --requirements ./requirements.txt --requirements ./requirements-server.txt; \
uv cache prune --ci; \
find ./.venv/ -exec touch -h -t $TIMESTAMP {} +
COPY ./searx/ ./searx/ COPY ./searx/ ./searx/
@ -13,12 +16,12 @@ ARG TIMESTAMP_SETTINGS="0"
RUN set -eux; \ RUN set -eux; \
python -m compileall -q ./searx/; \ python -m compileall -q ./searx/; \
touch -c --date=@$TIMESTAMP_SETTINGS ./searx/settings.yml; \ touch -c -t $TIMESTAMP_SETTINGS ./searx/settings.yml; \
find ./searx/static/ -type f \ find ./searx/static/ -type f \
\( -name "*.html" -o -name "*.css" -o -name "*.js" -o -name "*.svg" \) \ \( -name "*.html" -o -name "*.css" -o -name "*.js" -o -name "*.svg" \) \
-exec gzip -9 -k {} + \ -exec gzip -9 -k {} + \
-exec brotli -9 -k {} + \ -exec brotli -9 -k {} + \
-exec gzip --test {}.gz + \ -exec gzip --test {}.gz + \
-exec brotli --test {}.br +; \ -exec brotli --test {}.br +; \
# Move always changing files to /usr/local/searxng/ # Move always changing files to /usr/local/searxng/
mv ./searx/version_frozen.py ./ mv ./searx/version_frozen.py ./

View File

@ -10,48 +10,45 @@ with open('README.rst', encoding='utf-8') as f:
long_description = f.read() long_description = f.read()
with open('requirements.txt') as f: with open('requirements.txt') as f:
requirements = [ l.strip() for l in f.readlines()] requirements = [l.strip() for l in f.readlines()]
with open('requirements-dev.txt') as f: with open('requirements-dev.txt') as f:
dev_requirements = [ l.strip() for l in f.readlines()] dev_requirements = [l.strip() for l in f.readlines()]
setup( setup(
name='searxng', name='searxng',
python_requires=">=3.8", description="SearXNG is a metasearch engine. Users are neither tracked nor profiled.",
version=VERSION_TAG,
description="A privacy-respecting, hackable metasearch engine",
long_description=long_description, long_description=long_description,
license="AGPL-3.0-or-later",
author='SearXNG',
author_email='contact@searxng.org',
python_requires=">=3.10",
version=VERSION_TAG,
keywords='metasearch searchengine search web http',
url=get_setting('brand.docs_url'), url=get_setting('brand.docs_url'),
project_urls={
"Code": GIT_URL,
"Issue tracker": get_setting('brand.issue_url')
},
classifiers=[ classifiers=[
"Programming Language :: Python", "Development Status :: 5 - Production/Stable",
"Topic :: Internet", "Topic :: Internet",
"Topic :: Internet :: WWW/HTTP :: HTTP Servers", "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
"Topic :: Internet :: WWW/HTTP :: WSGI :: Application", "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
'License :: OSI Approved :: GNU Affero General Public License v3' "Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
], ],
keywords='metasearch searchengine search web http', project_urls={"Code": GIT_URL, "Issue tracker": get_setting('brand.issue_url')},
author='SearXNG dev team', entry_points={
author_email='contact@searxng.org', 'console_scripts': ['searxng-run = searx.webapp:run', 'searxng-checker = searx.search.checker.__main__:main']
license='GNU Affero General Public License', },
packages=find_packages( packages=find_packages(
include=[ include=[
'searx', 'searx.*', 'searx.*.*', 'searx.*.*.*', 'searx',
'searx.*',
'searx.*.*',
'searx.*.*.*',
] ]
), ),
install_requires=requirements,
extras_require={
'test': dev_requirements
},
entry_points={
'console_scripts': [
'searxng-run = searx.webapp:run',
'searxng-checker = searx.search.checker.__main__:main'
]
},
package_data={ package_data={
'searx': [ 'searx': [
'settings.yml', 'settings.yml',
@ -74,4 +71,6 @@ setup(
'translations/*/*/*', 'translations/*/*/*',
], ],
}, },
install_requires=requirements,
extras_require={'test': dev_requirements},
) )

View File

@ -102,7 +102,8 @@ container.build() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
"$container_engine" $params_build_builder \ "$container_engine" $params_build_builder \
--build-arg="TIMESTAMP_SETTINGS=$(git log -1 --format="%cd" --date=unix -- ./searx/settings.yml)" \ --build-arg="TIMESTAMP=$(git log -1 --date=format:'%Y%m%d%H%M.%S' --format='%ad')" \
--build-arg="TIMESTAMP_SETTINGS=$(git log -1 --date=format:'%Y%m%d%H%M.%S' --format='%ad' ./searx/settings.yml)" \
--tag="localhost/$CONTAINER_IMAGE_ORGANIZATION/$CONTAINER_IMAGE_NAME:builder" \ --tag="localhost/$CONTAINER_IMAGE_ORGANIZATION/$CONTAINER_IMAGE_NAME:builder" \
--file="./container/builder.dockerfile" \ --file="./container/builder.dockerfile" \
. .