diff options
| -rw-r--r-- | AUTHORS.rst | 5 | ||||
| -rw-r--r-- | Dockerfile | 19 | ||||
| -rwxr-xr-x | manage.sh | 2 | ||||
| -rw-r--r-- | searx/plugins/tracker_url_remover.py | 1 |
4 files changed, 14 insertions, 13 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst index 34d2dc25e..57834514b 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -1,4 +1,4 @@ -Searx was created by Adam Tauber and is maintained by Adam Tauber, Alexandre Flament, Noémi Ványi, @pofilo, Gaspard d'Hautefeuille and Markus Heiser. +Searx was created by Adam Tauber and is maintained by Adam Tauber, Noémi Ványi, @pofilo, Gaspard d'Hautefeuille and Émilien Devos. Major contributing authors: @@ -12,8 +12,9 @@ Major contributing authors: - @pofilo - Markus Heiser @return42 - Émilien Devos @unixfox +- Alexandre Flament -People who have submitted patches/translates, reported bugs, consulted features or +People who have submitted patches/translations, reported bugs, consulted features or generally made searx better: - Laszlo Hammerl diff --git a/Dockerfile b/Dockerfile index 3894aa968..d1a5632b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,21 +4,12 @@ EXPOSE 8080 VOLUME /etc/searx VOLUME /var/log/uwsgi -ARG GIT_URL=unknown -ARG VERSION_GITCOMMIT=unknown -ARG SEARX_GIT_VERSION=unknown - ARG SEARX_GID=977 ARG SEARX_UID=977 RUN addgroup -g ${SEARX_GID} searx && \ adduser -u ${SEARX_UID} -D -h /usr/local/searx -s /bin/sh -G searx searx -ARG TIMESTAMP_SETTINGS=0 -ARG TIMESTAMP_UWSGI=0 -ARG LABEL_VCS_REF= -ARG LABEL_VCS_URL= - ENV INSTANCE_NAME=searx \ AUTOCOMPLETE= \ BASE_URL= \ @@ -60,6 +51,10 @@ RUN apk upgrade --no-cache \ COPY --chown=searx:searx . . +ARG TIMESTAMP_SETTINGS=0 +ARG TIMESTAMP_UWSGI=0 +ARG VERSION_GITCOMMIT=unknown + RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \ touch -c --date=@${TIMESTAMP_SETTINGS} searx/settings.yml; \ touch -c --date=@${TIMESTAMP_UWSGI} dockerfiles/uwsgi.ini; \ @@ -70,8 +65,12 @@ RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \ -o -name '*.svg' -o -name '*.ttf' -o -name '*.eot' \) \ -type f -exec gzip -9 -k {} \+ -exec brotli --best {} \+ -# Keep this argument at the end since it change each time +# Keep these arguments at the end to prevent redundant layer rebuilds ARG LABEL_DATE= +ARG GIT_URL=unknown +ARG SEARX_GIT_VERSION=unknown +ARG LABEL_VCS_REF= +ARG LABEL_VCS_URL= LABEL maintainer="searx <${GIT_URL}>" \ description="A privacy-respecting, hackable metasearch engine." \ version="${SEARX_GIT_VERSION}" \ @@ -147,7 +147,7 @@ docker_build() { # define the docker image name GITHUB_USER=$(echo "${GIT_URL}" | sed 's/.*github\.com\/\([^\/]*\).*/\1/') - SEARX_IMAGE_NAME="${GITHUB_USER:-searx}/searx" + SEARX_IMAGE_NAME="${SEARX_IMAGE_NAME:-${GITHUB_USER:-searx}/searx}" # build Docker image echo "Building image ${SEARX_IMAGE_NAME}:${SEARX_GIT_VERSION}" diff --git a/searx/plugins/tracker_url_remover.py b/searx/plugins/tracker_url_remover.py index 742f39013..98ddddbcd 100644 --- a/searx/plugins/tracker_url_remover.py +++ b/searx/plugins/tracker_url_remover.py @@ -21,6 +21,7 @@ from urllib.parse import urlunparse, parse_qsl, urlencode regexes = {re.compile(r'utm_[^&]+'), re.compile(r'(wkey|wemail)[^&]*'), + re.compile(r'(_hsenc|_hsmi|hsCtaTracking|__hssc|__hstc|__hsfp)[^&]*'), re.compile(r'&$')} name = gettext('Tracker URL remover') |