Merge branch 'master' of https://github.com/asciimoo/searx into filtron

Browse Source
This commit is contained in:
Markus Heiser 2020-04-01 08:55:51 +02:00
commit 916d8a9e46
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -40,7 +40,7 @@ jobs:
install: true install: true
script: script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- local/py3/bin/activate; ./manage.sh docker_build push - make -e GIT_URL=$(git remote get-url origin) docker.push
after_success: true after_success: true
notifications: notifications:

3
Makefile
View File

@ -194,6 +194,9 @@ PHONY += docker
docker: buildenv docker: buildenv
$(Q)./manage.sh docker_build $(Q)./manage.sh docker_build
docker.push: buildenv
$(Q)./manage.sh docker_build push
# gecko # gecko
# ----- # -----