sync changes from upstream (88e32317) · Commits · e / infra / spot

.gitignore

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,10 @@ dist/
	local/		local/
	gh-pages/		gh-pages/
	searx.egg-info/		searx.egg-info/
			<<<<<<< HEAD

	*.eggs		*.eggs
			=======
			>>>>>>> 03eb9c2461194b81ce978253aceaab587cca975f
	.env		.env
	geckodriver.log		geckodriver.log

Dockerfile

+82 −0

Original line number	Original line	Diff line number	Diff line
			<<<<<<< HEAD
	FROM base-env-image as builder		FROM base-env-image as builder
	# base-env-image -> ${CI_REGISTRY_IMAGE}/env		# base-env-image -> ${CI_REGISTRY_IMAGE}/env
			=======
			FROM alpine:3.15
			ENTRYPOINT ["/sbin/tini","--","/usr/local/searx/dockerfiles/docker-entrypoint.sh"]
			EXPOSE 8080
			VOLUME /etc/searx
			VOLUME /var/log/uwsgi
			>>>>>>> 03eb9c2461194b81ce978253aceaab587cca975f

	COPY . /src/		COPY . /src/
	RUN pip install --force-reinstall --prefix /install /src		RUN pip install --force-reinstall --prefix /install /src
	@@ -16,4 +24,78 @@ COPY --from=builder /install/ /usr/local/
	EXPOSE 80		EXPOSE 80
	STOPSIGNAL SIGINT		STOPSIGNAL SIGINT

			<<<<<<< HEAD
	CMD ["gunicorn", "-w", "1", "-b", "0.0.0.0:80", "--pythonpath", "/usr/local/lib/python3.9/site-packages", "searx.webapp:app"]		CMD ["gunicorn", "-w", "1", "-b", "0.0.0.0:80", "--pythonpath", "/usr/local/lib/python3.9/site-packages", "searx.webapp:app"]
			=======
			COPY requirements.txt ./requirements.txt

			RUN apk upgrade --no-cache \
			&& apk add --no-cache -t build-dependencies \
			build-base \
			py3-setuptools \
			python3-dev \
			libffi-dev \
			libxslt-dev \
			libxml2-dev \
			openssl-dev \
			tar \
			git \
			&& apk add --no-cache \
			ca-certificates \
			su-exec \
			python3 \
			py3-pip \
			libxml2 \
			libxslt \
			openssl \
			tini \
			uwsgi \
			uwsgi-python3 \
			brotli \
			&& pip3 install --upgrade pip wheel setuptools \
			&& pip3 install --no-cache -r requirements.txt \
			&& apk del build-dependencies \
			&& rm -rf /root/.cache

			COPY searx ./searx
			COPY dockerfiles ./dockerfiles

			ARG TIMESTAMP_SETTINGS=0
			ARG TIMESTAMP_UWSGI=0
			ARG VERSION_GITCOMMIT=unknown

			RUN /usr/bin/python3 -m compileall -q searx; \
			touch -c --date=@${TIMESTAMP_SETTINGS} searx/settings.yml; \
			touch -c --date=@${TIMESTAMP_UWSGI} dockerfiles/uwsgi.ini; \
			if [ ! -z $VERSION_GITCOMMIT ]; then\
			echo "VERSION_STRING = VERSION_STRING + \"-$VERSION_GITCOMMIT\"" >> /usr/local/searx/searx/version.py; \
			fi; \
			find /usr/local/searx/searx/static -a \( -name '.html' -o -name '.css' -o -name '*.js' \
			-o -name '.svg' -o -name '.ttf' -o -name '*.eot' \) \
			-type f -exec gzip -9 -k {} \+ -exec brotli --best {} \+

			# 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}" \
			org.label-schema.schema-version="1.0" \
			org.label-schema.name="searx" \
			org.label-schema.version="${SEARX_GIT_VERSION}" \
			org.label-schema.url="${LABEL_VCS_URL}" \
			org.label-schema.vcs-ref=${LABEL_VCS_REF} \
			org.label-schema.vcs-url=${LABEL_VCS_URL} \
			org.label-schema.build-date="${LABEL_DATE}" \
			org.label-schema.usage="https://github.com/searx/searx-docker" \
			org.opencontainers.image.title="searx" \
			org.opencontainers.image.version="${SEARX_GIT_VERSION}" \
			org.opencontainers.image.url="${LABEL_VCS_URL}" \
			org.opencontainers.image.revision=${LABEL_VCS_REF} \
			org.opencontainers.image.source=${LABEL_VCS_URL} \
			org.opencontainers.image.created="${LABEL_DATE}" \
			org.opencontainers.image.documentation="https://github.com/searx/searx-docker"
			>>>>>>> 03eb9c2461194b81ce978253aceaab587cca975f

README.rst

0 → 100644

+73 −0

Original line number	Original line	Diff line number	Diff line
			.. SPDX-License-Identifier: AGPL-3.0-or-later

			.. figure:: https://raw.githubusercontent.com/searx/searx/master/searx/static/themes/oscar/img/logo_searx_a.png
			:target: https://searx.github.io/searx/
			:alt: searX
			:width: 100%
			:align: center

			-------

			\|searx install\|
			\|searx homepage\|
			\|searx wiki\|
			\|AGPL License\|
			\|Issues\|
			\|commits\|
			\|OpenCollective searx backers\|
			\|OpenCollective searx sponsors\|

			Privacy-respecting, hackable `metasearch engine`_ / pronunciation sɜːks.

			.. _metasearch engine: https://en.wikipedia.org/wiki/Metasearch_engine

			.. \|searx install\| image:: https://img.shields.io/badge/-install-blue
			:target: https://searx.github.io/searx/admin/installation.html

			.. \|searx homepage\| image:: https://img.shields.io/badge/-homepage-blue
			:target: https://searx.github.io/searx

			.. \|searx wiki\| image:: https://img.shields.io/badge/-wiki-blue
			:target: https://github.com/searx/searx/wiki

			.. \|AGPL License\| image:: https://img.shields.io/badge/license-AGPL-blue.svg
			:target: https://github.com/searx/searx/blob/master/LICENSE

			.. \|Issues\| image:: https://img.shields.io/github/issues/searx/searx?color=yellow&label=issues
			:target: https://github.com/searx/searx/issues

			.. \|PR\| image:: https://img.shields.io/github/issues-pr-raw/searx/searx?color=yellow&label=PR
			:target: https://github.com/searx/searx/pulls

			.. \|commits\| image:: https://img.shields.io/github/commit-activity/y/searx/searx?color=yellow&label=commits
			:target: https://github.com/searx/searx/commits/master

			.. \|OpenCollective searx backers\| image:: https://opencollective.com/searx/backers/badge.svg
			:target: https://opencollective.com/searx#backer

			.. \|OpenCollective searx sponsors\| image:: https://opencollective.com/searx/sponsors/badge.svg
			:target: https://opencollective.com/searx#sponsor


			If you are looking for running instances, ready to use, then visit searx.space_.

			Otherwise jump to the user_, admin_ and developer_ handbooks you will find on
			our homepage_.

			.. _searx.space: https://searx.space
			.. _user: https://searx.github.io/searx/user
			.. _admin: https://searx.github.io/searx/admin
			.. _developer: https://searx.github.io/searx/dev
			.. _homepage: https://searx.github.io/searx

			contact:
			openhub_ // twitter_ // IRC: #searx @ Libera (irc.libera.chat)

			.. _openhub: https://www.openhub.net/p/searx
			.. _twitter: https://twitter.com/Searx_engine

			-------

			\|gluten free\|

			.. \|gluten free\| image:: https://forthebadge.com/images/featured/featured-gluten-free.svg

manage

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,10 @@ source_dot_config

	PY_SETUP_EXTRAS='[test]'		PY_SETUP_EXTRAS='[test]'
	NPM_PACKAGES="less@2.7 less-plugin-clean-css grunt-cli"		NPM_PACKAGES="less@2.7 less-plugin-clean-css grunt-cli"
			<<<<<<< HEAD
	NPM_VERSION="6.14.5"		NPM_VERSION="6.14.5"
			=======
			>>>>>>> 03eb9c2461194b81ce978253aceaab587cca975f
	GECKODRIVER_VERSION="v0.30.0"		GECKODRIVER_VERSION="v0.30.0"
	# SPHINXOPTS=		# SPHINXOPTS=

requirements-dev.txt

+8 −0

Original line number	Original line	Diff line number	Diff line
	mock==4.0.3		mock==4.0.3
	nose2[coverage_plugin]==0.10.0		nose2[coverage_plugin]==0.10.0
	cov-core==1.15.0		cov-core==1.15.0
			<<<<<<< HEAD
	pycodestyle==2.7.0		pycodestyle==2.7.0
	pylint==2.10.2		pylint==2.10.2
			=======
			pycodestyle==2.8.0
			pylint==2.12.2
			>>>>>>> 03eb9c2461194b81ce978253aceaab587cca975f
	splinter==0.17.0		splinter==0.17.0
	transifex-client==0.14.3; python_version < '3.10'		transifex-client==0.14.3; python_version < '3.10'
	transifex-client==0.12.1; python_version == '3.10'		transifex-client==0.12.1; python_version == '3.10'
	@@ -18,4 +23,7 @@ sphinxcontrib-programoutput==0.17
	sphinx-autobuild==2021.3.14		sphinx-autobuild==2021.3.14
	linuxdoc==20211220		linuxdoc==20211220
	aiounittest==1.4.1		aiounittest==1.4.1
			<<<<<<< HEAD
	werkzeug==2.0.3		werkzeug==2.0.3
			=======
			>>>>>>> 03eb9c2461194b81ce978253aceaab587cca975f