1
0
mirror of https://github.com/searxng/searxng.git synced 2024-11-09 06:30:10 +01:00
Commit Graph

52 Commits

Author SHA1 Message Date
Markus Heiser
9e53470b4c [mod] get rid of searx/brand.py
Removes module searx/brand.py and creates a namespace at searx.brand.

This patch is a first 'proof of concept'.  Later we can decide to remove the
brand namespace entirely or not.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-01-11 22:12:38 +01:00
Alexandre Flament
54e69d0367 [upd] update dependencies
minor change in the oscar theme becase the last version of jinja2
respect more carefully the spaces in the templates
2020-12-28 09:04:39 +01:00
Dalf
1022228d95 Drop Python 2 (1/n): remove unicode string and url_utils 2020-09-10 10:39:04 +02:00
Alexandre Flament
272158944b [fix] make docker produces clean tag version (0.17.0 instead of 0.17.0-- for example)
Fix #2152
2020-09-10 10:09:15 +02:00
Markus Heiser
4bae1a9eab
Merge branch 'master' into fix/manage.sh 2020-04-29 12:55:13 +00:00
Markus Heiser
ceceee546b [fix] Remove english shell dependency in manage.sh script
see https://github.com/asciimoo/searx/pull/1479#issuecomment-569904632

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-29 14:36:47 +02:00
Markus Heiser
5f1cba5337 Revert "fix: Remove english shell dependency in manage.sh script"
This reverts commit 7b9c8f777b.
2020-04-29 14:33:47 +02:00
Dalf
4dad366146 [fix] travis: fix docker tag.
the "-dirty" ignores the searx/brand.py and utils/brand.env files.
2020-04-02 15:06:10 +02:00
Markus Heiser
442b27ac1b bash: use build environment from Makefile
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-29 11:41:59 +02:00
Markus Heiser
1075f58a72 test: move tests from manage.sh to Makefile
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26 18:41:45 +01:00
Markus Heiser
e7fbefa8bd build: move build styles from manage.sh to Makefile
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 18:00:07 +01:00
Markus Heiser
00251d7c66 Makefile: add target 'useragents.update' to fetch versions of Firefox
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-26 13:32:08 +01:00
Markus Heiser
2d12f221a7 [fix] docker build: set build argument LABEL_VCS_URL to GIT_URL
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25 15:17:11 +01:00
Markus Heiser
3dbade0aed [fix] brands: add GIT_URL variable to the docker build
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25 14:50:39 +01:00
Markus Heiser
757ebb5d9f [fix] brands: add variables from build env to grunt process
We have some variables in the build environment which are also needed in the
grunt process when building themes.  Theses variables are relavant if one
creates a fork with its own branding.  We treat these variables under the term
'brands'.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25 14:09:47 +01:00
Adam Tauber
da56bda265
Merge pull request #1457 from hobbestigrou/force_upgrade_requirements
[Scripts] Force upgrade requirements.
2019-12-17 13:55:13 +00:00
Étienne Deparis
7b9c8f777b fix: Remove english shell dependency in manage.sh script 2019-12-15 14:23:19 +01:00
Marc Abonce Seguin
94ca30de1b add a shortcut for utils/fetch_firefox_version.py in manage.sh 2019-11-23 19:26:48 -07:00
Dalf
90b24f1060 manage.sh grunt_build: add node_modules/.bin to the path 2019-08-06 11:49:46 +02:00
Dalf
fbe40001d3 Update Docker image
See #1561 , use uwsgi and Alpine Linux

Volume:
/var/log/uwsgi contains error log for 2 days (file uwsgi.log)
/etc/searx contains the settings.yml and uwsgi.ini files.
The docker image creates them if they don't exist.
The two files can be modified after the first run. See below.

Environement variables:
MORTY_URL : external URL of Morty
MORTY_KEY : base64 encoded key
BASE_URL : external URL of Searx
BIND_ADDRESS : internal HTTP port to listen to

Labels : org.label-schema.schema.*

Parameters:
-h : display this help
-d : will update the settings and quit immediately (settings.yml and uwsgi.ini)
-f : always update the settings (previous version saved with suffix .old).
     without this parameter, the new settings are copied with suffix .new

When the Docker image contains newer settings:
- without -f parameter: the new versions are copied to /etc/searx/settings.yml.new and /etc/searx/uwsgi.ini.new.
- with -f parameter:  the old versions are renamed with .old suffix. The new version replaces /etc/searx/settings.yml and /etc/searx/uwsgi.ini

Build using "./manage.sh docker_build", add "push" as parameter also push the Docker image.
The script requires a git repository to work (it makes sure that the last git tag matches searx/version.py)
"git describe" is used to create a meaningful version.
Example : 0.15.0-90-49c5bcb4-dirty (dirty means that the docker image was made with uncommited changes).

Use "docker inspect -f {{.Config.Labels.version}} searx" to get the version of an existing image.

.dockerignore based on .gitignore

.travis.yml: include docker stage
2019-07-13 15:49:59 +02:00
Alexandre Flament
3faaf34e25
Fix ./manage.sh robot_tests (#1633)
doi_resolvers / default_doi_resolver were missing in the settings_robots.yml file, so the test server was not able to start (crash). Since the output wasn't displayed, it was not obvious why the Selenium couldn't connect to searx.
2019-07-06 18:47:35 +02:00
Natal Ngétal
e75af78d7a [Scripts] Force upgrade requirements.
Force the upgrade of requirements with pip. At the moment, if the version
in the requirement file is changed, there will be no effect, because the
dependencies is already present.
2018-12-05 18:52:36 +01:00
dalf
d19a0f469c manage.sh : no error when npm is not found and not required 2018-08-26 10:32:32 +02:00
Alex
ec62e00df9 manage.sh : minor change 2018-08-01 11:53:08 +02:00
Noémi Ványi
e2f15b33c4 change echo to printf 2018-02-21 21:31:12 +01:00
Noémi Ványi
4c995c4201 remove the option of sourcing manage.sh 2018-02-21 20:46:58 +01:00
Alexandre Flament
5dc8b271f0 [mod] simplify manage.sh
- npm install less@2.7 less-plugin-clean-css grunt-cli is moved inside manage.sh
- if it is possible to source manage.sh to update the PATH (to start grunt)
- tidy the help documentation
- update the geckodriver version to 0.19.1
2017-12-10 10:39:12 +01:00
Thirnearez
9224b3c3f0 adjust whitespace in shell scripts 2017-10-06 21:00:22 +02:00
Thirnearez
076cfe25d7 handle input carefully in shell scripts
- prevent whitespace-splitting of variable expansions
- prevent interpretation of values as flags/options

(mostly)
2017-10-06 21:00:22 +02:00
Thirnearez
2790402060 fix a shell typo that generated a bogus file 2017-10-06 21:00:22 +02:00
Alexandre Flament
fb587f11fe Switch to code-cov 2017-09-17 17:52:22 +02:00
Alexandre Flament
5baad02c06 "./manage.sh update_packages" updates pip and setuptools
Fix issue #887, #962
2017-08-16 19:22:36 +02:00
Alexandre Flament
1a814369fd [fix] manage.sh: add quotes arround parameters dealing with directories or files. 2017-08-16 18:14:07 +02:00
Alexandre Flament
d87eb4da61 [mod] travis build : travis uses ./manage.sh to install the geckodriver
./manage.sh don't build css that are built by ./manage.sh grunt_build
2017-08-13 14:01:09 +02:00
Alexandre Flament
57dc6b625f [fix] travis build : various fix about grunt builds 2017-08-13 13:41:59 +02:00
Alexandre Flament
d0cebd6e77 [fix] fix selenium tests 2017-08-13 12:57:08 +02:00
Alexandre Flament
10a24bdc2c [enh] add simple theme (WIP) 2017-08-06 16:04:21 +02:00
Adam Tauber
c0993ece54 [fix] do not do unnecessary package upgrades 2017-01-26 23:30:57 +01:00
Alexandre Flament
6db25fc5c2 [mod] ./manage.sh can download geckodriver and install it into the virtual environment 2017-01-03 19:25:04 +01:00
Adam Tauber
bee7b497a3 [mod] rename "default" theme to "legacy" 2016-09-22 23:51:07 +02:00
Adam Tauber
27f4373124 [fix] styles fix according to the new oscar dir structure 2016-07-15 13:16:13 +02:00
Jan Verbeek
42debcfe3c Quote variables and backticks
Otherwise the script fails with spaces or asterisks in the directory path.
2016-07-05 07:33:43 +00:00
Adam Tauber
dbf4f83231 [fix] manage.sh return with actions exit status 2016-03-17 21:43:31 +01:00
Adam Tauber
1d5afa4ccc [fix] posix compatibility 2016-03-17 21:31:45 +01:00
Thomas Pointhuber
ceb70ccb5d [fix] improve argument parsing of manage.sh 2016-03-02 18:41:19 +01:00
Adam Tauber
bd22e9a336 [fix] pep8 compatibilty 2016-01-18 12:47:31 +01:00
Adam Tauber
6a158ca2d2 [fix] manage.sh dev package update help 2016-01-10 20:29:07 +01:00
Adam Tauber
28a9b5113e [mod] update core deps with dev deps 2016-01-10 19:23:10 +01:00
Adam Tauber
1e4f0bedc5 [doc] command descriptions 2016-01-10 19:23:10 +01:00
Adam Tauber
52323a4b4e [fix] grunt action name 2016-01-10 19:23:10 +01:00