Commit Graph

48 Commits (8199ab50f9eda3781ba3227a002f08fae0399cc5)

Author SHA1 Message Date
Markus Heiser 4bae1a9eab
Merge branch 'master' into fix/manage.sh 4 years ago
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>
4 years ago
Markus Heiser 5f1cba5337 Revert "fix: Remove english shell dependency in manage.sh script"
This reverts commit 7b9c8f777b.
4 years ago
Dalf 4dad366146 [fix] travis: fix docker tag.
the "-dirty" ignores the searx/brand.py and utils/brand.env files.
4 years ago
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>
4 years ago
Markus Heiser 1075f58a72 test: move tests from manage.sh to Makefile
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
4 years ago
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>
4 years ago
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
4 years ago
Markus Heiser 2d12f221a7 [fix] docker build: set build argument LABEL_VCS_URL to GIT_URL
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
4 years ago
Markus Heiser 3dbade0aed [fix] brands: add GIT_URL variable to the docker build
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
4 years ago
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>
4 years ago
Adam Tauber da56bda265
Merge pull request #1457 from hobbestigrou/force_upgrade_requirements
[Scripts] Force upgrade requirements.
5 years ago
Étienne Deparis 7b9c8f777b fix: Remove english shell dependency in manage.sh script 5 years ago
Marc Abonce Seguin 94ca30de1b add a shortcut for utils/fetch_firefox_version.py in manage.sh 5 years ago
Dalf 90b24f1060 manage.sh grunt_build: add node_modules/.bin to the path 5 years ago
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
5 years ago
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.
5 years ago
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.
6 years ago
dalf d19a0f469c manage.sh : no error when npm is not found and not required 6 years ago
Alex ec62e00df9 manage.sh : minor change 6 years ago
Noémi Ványi e2f15b33c4 change echo to printf 6 years ago
Noémi Ványi 4c995c4201 remove the option of sourcing manage.sh 6 years ago
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
7 years ago
Thirnearez 9224b3c3f0 adjust whitespace in shell scripts 7 years ago
Thirnearez 076cfe25d7 handle input carefully in shell scripts
- prevent whitespace-splitting of variable expansions
- prevent interpretation of values as flags/options

(mostly)
7 years ago
Thirnearez 2790402060 fix a shell typo that generated a bogus file 7 years ago
Alexandre Flament fb587f11fe Switch to code-cov 7 years ago
Alexandre Flament 5baad02c06 "./manage.sh update_packages" updates pip and setuptools
Fix issue #887, #962
7 years ago
Alexandre Flament 1a814369fd [fix] manage.sh: add quotes arround parameters dealing with directories or files. 7 years ago
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
7 years ago
Alexandre Flament 57dc6b625f [fix] travis build : various fix about grunt builds 7 years ago
Alexandre Flament d0cebd6e77 [fix] fix selenium tests 7 years ago
Alexandre Flament 10a24bdc2c [enh] add simple theme (WIP) 7 years ago
Adam Tauber c0993ece54 [fix] do not do unnecessary package upgrades 7 years ago
Alexandre Flament 6db25fc5c2 [mod] ./manage.sh can download geckodriver and install it into the virtual environment 8 years ago
Adam Tauber bee7b497a3 [mod] rename "default" theme to "legacy" 8 years ago
Adam Tauber 27f4373124 [fix] styles fix according to the new oscar dir structure 8 years ago
Jan Verbeek 42debcfe3c Quote variables and backticks
Otherwise the script fails with spaces or asterisks in the directory path.
8 years ago
Adam Tauber dbf4f83231 [fix] manage.sh return with actions exit status 8 years ago
Adam Tauber 1d5afa4ccc [fix] posix compatibility 8 years ago
Thomas Pointhuber ceb70ccb5d [fix] improve argument parsing of manage.sh 8 years ago
Adam Tauber bd22e9a336 [fix] pep8 compatibilty 8 years ago
Adam Tauber 6a158ca2d2 [fix] manage.sh dev package update help 9 years ago
Adam Tauber 28a9b5113e [mod] update core deps with dev deps 9 years ago
Adam Tauber 1e4f0bedc5 [doc] command descriptions 9 years ago
Adam Tauber 52323a4b4e [fix] grunt action name 9 years ago
Adam Tauber 39d2e0427f [fix] robot tests and pep8 check 9 years ago
Adam Tauber 53979a7bf7 [mod] remove buildout/makefile infrastructure 9 years ago