summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-01travis: remove platform option arm64Markus Heiser
[1] https://github.com/asciimoo/searx/pull/1910#issuecomment-607244871 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01Revert "travis: disable cache"Markus Heiser
This reverts commit eb87b07d519592b8863a3aeb39eb0a758083f5cc.
2020-04-01travis: disable cacheMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01[fix] travis: Permission denied: '/home/travis/.cache/pip/...'Markus Heiser
Fix "Permission denied: '/home/travis/.cache/" errors from travis build [1]. Change owner https://docs.travis-ci.com/user/caching/#caches-and-read-permissions and remove old log in the *before_caching* phase: https://docs.travis-ci.com/user/caching/#before_cache-phase About pip cache see: https://docs.travis-ci.com/user/caching/#pip-cache Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> [1] https://travis-ci.org/github/asciimoo/searx/jobs/669664131#L220
2020-04-01makefile.python: hardening - drop virtualenv, drop build support py2Markus Heiser
From py3.3 on a subset of virtualenv is built-in, so you can run '-m venv' ot of the box. - replace: $(PY_ENV_BIN)/pip --> $(PY_ENV_BIN)/python -m pip - remove obsolete virtualenv-exe target and adjust VTENV_OPTS - remove obsolete msg-pip-exe target - print list of py launchers available from $(PY_ENV_BIN) to the log - fix hard coded ./local Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01travis: build on os: linux, dist: bionic, use platform arch: arm64Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01travis: make travis build more verboseMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01[fix] travis: Permission denied: '/home/travis/.cache/pip/...'Markus Heiser
Change owner https://docs.travis-ci.com/user/caching/#caches-and-read-permissions and remove old log in the *before_caching* phase: https://docs.travis-ci.com/user/caching/#before_cache-phase About pip cache see: https://docs.travis-ci.com/user/caching/#pip-cache Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01travis: build on os: linux, dist: bionic, use platform arch: arm64Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01travis: make travis build more verboseMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01travis: make travis build more verboseMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01makefile.python: fix (old) typoMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01Merge branch 'master' of https://github.com/asciimoo/searx into filtronMarkus Heiser
2020-04-01Merge pull request #1905 from dalf/docker-build-fixMarkus Heiser
[fix] travis: fix docker build.
2020-03-31Merge branch 'master' into docker-build-fixAlexandre Flament
2020-03-31Merge branch 'master' of https://github.com/asciimoo/searx into filtronMarkus Heiser
2020-03-31docs: use make and uitls/searx.sh in containersMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-31Merge pull request #1906 from dalf/pr-1900-typo-fixMarkus Heiser
[fix] template: fix typo in about.html
2020-03-31[fix] template: fix typo in about.htmlDalf
2020-03-31[fix] fix travis buildDalf
2020-03-30Merge branch 'master' of https://github.com/asciimoo/searx into filtronMarkus Heiser
2020-03-30docs: add utils/lxc.sh docs, normalize filtron, morty & searx docsMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-30Merge pull request #1900 from return42/issue-1898Markus Heiser
export build variables / support brands
2020-03-30docs: document Makefile setup and 'buildenv' (aka brand)Markus Heiser
Add documentation of the Makefile environment (aka brand, buildenv), introduced in PR #1900. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-30Merge PR #1900 of https://github.com/asciimoo/searx into filtronMarkus Heiser
2020-03-30Makefile: rename target 'searx.brand' to 'buildenv'Markus Heiser
And add 'buildenv' as an first order prerequisite to the main targets: - install - run - docs - docs-live - project - node.env - docker - test Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-30[fix] make test.sh: fix various shellcheck error messagesMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29Makefile: marginal fixMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29build environment: add GIT_BRANCH variableMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29tooling box: simplify build enviromentsMarkus Heiser
- no more need for a .config.mk - docs: use searx.brands environment - searx.sh, filtron.sh & morty.sh are sourcing utils/brand.env Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29Merge PR #1900 of https://github.com/asciimoo/searx into filtronMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29[fix] travis: reomve 'make style' from travis buildMarkus Heiser
Commit 8a16903a removes Makefile target style Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29bash: use build environment from MakefileMarkus Heiser
To Makefile target brand, add creation of bash environment in:: utils/brand.env In bash scripts (manage.sh) source env by:: . utils/brand.env manage.sh help: show GIT_URL and more environment Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29make themes: rename 'style' targtes to 'themes' targetsMarkus Heiser
style.legacy could be renamed themes.legacy : it actually builds the files for the legacy theme, then themes.legacy can be a dependency of themes. Same for the other styles.* Debatable: about style.bootstrap, same convention : theme.bootstrap (even it is more a toolbox for the oscar theme). So there is no need to add the missing make styles in the help target. thanks @dalf: - https://github.com/asciimoo/searx/pull/1900#discussion_r399160355 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29[fix] docker 'Error compiling' and 'SyntaxError' messagesMarkus Heiser
The make docker target spits out some SyntaxError. With this .dockerignore there is no more error. Explanation: - the python files are compiled while building the docker image - a node modules contains some python files - the python files inside the node module doesn't compile It raises the fact that node_modules were included in the docker image which should not happen. Same the local directory was included. Dockerfile builds searx in its own way (without virtualenv) Thanks @dalf: - https://github.com/asciimoo/searx/pull/1900#issuecomment-604892737 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26travis: use build environment from MakefileMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26test: move tests from manage.sh to MakefileMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26build: move build styles from manage.sh to MakefileMarkus Heiser
To build all styles use: make styles To build individual styles use one of: make style.legacy make style.courgette make style.pixart make style.bootstrap Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26.gitignore: make package-lock.json visibleMarkus Heiser
Even if we do not versioning them right now. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26Minor improvements of the HTML *about* pageMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26make project: re-build generic files of the searx projectMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26Makefile: add target 'useragents.update' to fetch versions of FirefoxMarkus Heiser
Update searx/data/useragents.json with the most recent versions of Firefox. BTW: add 'useragents.update' to 'project' target and clean up the Makefile and remove it from the manage.sh script. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> closes: https://github.com/asciimoo/searx/issues/1882
2020-03-26Rewrite of the HTL *about* pageMarkus Heiser
The *about* page should only address higher-level issues that are important to each user. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26brands: hardcode ISSUE_URL and some links on the about-pageMarkus Heiser
A *brand* of searx is a fork which might have its own design and some special functions which might bee reasonable in a special context. In this sense, the fork might have its own documentation but not its own issue tracker. The *upstream* of a brand is always https://github.com/asciimoo from where the brand-fork pulls the master branch regularly. A fork which has its own issue tracker is a spin-off and out of the scope of the searx project itself. The conclusion is: - hard code ISSUE_URL (in the Makefile) - always refer to DOCS_URL - links in the about page refer to the *upstream* (searx project) except DOCS_URL - "fork me on github" ribbons refer to the *upstream* Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25brands: add ISSUE_URLMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25webapp.py: expose the brand variable in the /config URL.Markus Heiser
E.g. helpful for searx-stats2 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25webapp.py: partial code review (no functional change)Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25Makefile: add target node.env - download & install npm dependenciesMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25[fix] docker build: set build argument LABEL_VCS_URL to GIT_URLMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25[fix] brands: add GIT_URL variable to the docker buildMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-23 00:33:05 +0000