Cutlery/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2025-10-26 08:12:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

[fix] utils: variable expansion (#5237)

Browse Source 
Docker buildx outputs the following error:

  variable expansion is not supported for --from, define a new stage with FROM
  using ARG from global scope as a workaround.

Also force BuildKit extension to be installed, legacy build is no longer
supported.

Closes https://github.com/searxng/searxng/issues/5219
This commit is contained in:
Ivan Gabaldon 2025-09-23 20:34:28 +02:00 committed by GitHub
parent a57b29b009
commit d2e2802514
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
container/dist.dockerfile
View File

@ -1,10 +1,11 @@
FROM ghcr.io/searxng/base:searxng AS dist
ARG CONTAINER_IMAGE_ORGANIZATION="searxng" ARG CONTAINER_IMAGE_ORGANIZATION="searxng"
ARG CONTAINER_IMAGE_NAME="searxng" ARG CONTAINER_IMAGE_NAME="searxng"
COPY --chown=searxng:searxng --from=localhost/$CONTAINER_IMAGE_ORGANIZATION/$CONTAINER_IMAGE_NAME:builder /usr/local/searxng/.venv/ ./.venv/ FROM localhost/$CONTAINER_IMAGE_ORGANIZATION/$CONTAINER_IMAGE_NAME:builder AS builder
COPY --chown=searxng:searxng --from=localhost/$CONTAINER_IMAGE_ORGANIZATION/$CONTAINER_IMAGE_NAME:builder /usr/local/searxng/searx/ ./searx/ FROM ghcr.io/searxng/base:searxng AS dist
COPY --chown=searxng:searxng --from=builder /usr/local/searxng/.venv/ ./.venv/
COPY --chown=searxng:searxng --from=builder /usr/local/searxng/searx/ ./searx/
COPY --chown=searxng:searxng ./container/ ./ COPY --chown=searxng:searxng ./container/ ./
#COPY --chown=searxng:searxng ./searx/version_frozen.py ./searx/ #COPY --chown=searxng:searxng ./searx/version_frozen.py ./searx/

4
utils/lib_sxng_container.sh
View File

@ -62,6 +62,10 @@ container.build() {
esac esac
info_msg "Selected platform: $platform" info_msg "Selected platform: $platform"
if [ "$container_engine" = "docker" ] && ! docker buildx version &>/dev/null; then
die 42 "docker buildx is not installed: https://docs.docker.com/go/buildx/"
fi
pyenv.install pyenv.install
( (