From cf71748a91bf2eb1b7cb6345febb91adb3427a39 Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Thu, 16 Aug 2018 04:55:03 +0100
Subject: [PATCH] chore: fix release conditions

---
 .goreleaser.yml | 2 +-
 .travis.yml     | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 84a38345..f535e474 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -51,7 +51,7 @@ dockers:
     goarch: amd64
     goarm: ''
     image: filebrowser/filebrowser
-    skip_push: true
+    skip_push: false
     tag_templates:
       - "{{ .Tag }}"
       - latest
diff --git a/.travis.yml b/.travis.yml
index e0647813..8d044ab2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,9 +35,7 @@ jobs:
         branch: master
   - stage: release
     script:
-      - ./build/docker_login.sh
-      - docker run --rm -itv $(pwd):$WDIR -v /var/run/docker.sock:/var/run/docker.sock filebrowser/dev goreleaser
-      - docker logout
+      - docker run --rm -itv $(pwd):$WDIR -v /var/run/docker.sock:/var/run/docker.sock filebrowser/dev sh -c "./build/docker_login.sh && goreleaser; docker logout"
       - ./build/push_ricebox.sh
     if: tag IS present
     deploy:
@@ -48,4 +46,5 @@ jobs:
       file_glob: true
       on:
         repo: filebrowser/filebrowser
-        branch: master
+        all_branches: true
+        tags: true