summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-04utils/lxc.sh install: support installation on selected containersMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-04docs: remove PR #1803 hintsMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-03utils/morty.sh: add generic documentationMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-03utils/filtron.sh: add generic documentationMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-03utils/lxc.sh: support build of selected containersMarkus Heiser
$ sudo -H ./utils/lxc.sh build <name> $ sudo -H ./utils/lxc.sh show [images|suite|info|config [<name>]] Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-02LXC: add virtualenv to LXC_BASE_PACKAGESMarkus Heiser
Commit 09a40625 adds virtualenv dependency. BTW remove deprecated --no-site-packages. Not having access to global site-packages is now the default behavior. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-02Merge branch 'master' of https://github.com/asciimoo/searx into filtronMarkus Heiser
2020-04-02Merge pull request #1910 from return42/rfc-travisMarkus Heiser
improve travis build
2020-04-02Merge branch 'master' into rfc-travisMarkus Heiser
2020-04-02travis: remove before_cache handleMarkus Heiser
BTW: separate env output in the travis log Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-02Merge pull request #1911 from dalf/docker-tag-fixMarkus Heiser
[fix] travis: fix docker tag.
2020-04-02[fix] travis: fix docker tag.Dalf
the "-dirty" ignores the searx/brand.py and utils/brand.env files.
2020-04-01make test.pylint: do not run pylint checks in py2Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01makefile.python: partial revert off 9b48ae47, adds py2 support backMarkus Heiser
revert "makefile.python: ... drop build support py2" to get back Py2 support. TPy2 support need virtualenv installed by the OS. BTW: log environment and python version in travis's install phase Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01makefile.python: hardening - start pylint by moduleMarkus Heiser
- replace: $(PY_ENV_BIN)/pylint --> $(PY_ENV_BIN)/python -m pylint Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01travis: use Makefile target travis.codecov to install codecovMarkus Heiser
fix travis build error [1]:: The command "local/py3/bin/pip install codecov" failed and exited with 127 Use the correct pip (python environment) from build environment:: $(PY_ENV_BIN)/python -m pip [1] https://travis-ci.org/github/asciimoo/searx/jobs/669701405#L590 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
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>