summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2020-04-01 08:55:51 +0200
committerMarkus Heiser <markus.heiser@darmarit.de>2020-04-01 08:55:51 +0200
commit916d8a9e46f6bebbbf85fb0116f527b70e74c31c (patch)
tree849a1e2385da414b2d7bf2b5fcc78d6ea3292656
parent81b9848eb9e8f589ec5d04edb513ced551977891 (diff)
parent8189e18d91e55388cec48d73a9d7648b1c148d0b (diff)
downloadsearxng-916d8a9e46f6bebbbf85fb0116f527b70e74c31c.tar.gz
searxng-916d8a9e46f6bebbbf85fb0116f527b70e74c31c.zip
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
-rw-r--r--.travis.yml2
-rw-r--r--Makefile3
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 1667cd37c..8c3f7285c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ jobs:
install: true
script:
- 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
notifications:
diff --git a/Makefile b/Makefile
index 73279ad25..f38b5ca89 100644
--- a/Makefile
+++ b/Makefile
@@ -194,6 +194,9 @@ PHONY += docker
docker: buildenv
$(Q)./manage.sh docker_build
+docker.push: buildenv
+ $(Q)./manage.sh docker_build push
+
# gecko
# -----