Merge branch 'master' into ha-meters-update

Author: BanzaiMan

.travis.yml

@@ -7,8 +7,14 @@ rvm: 2.6.5
 
 script: "bundle exec rake knapsack:rspec"
 
+addons:
+  - snaps:
+    - name: docker
+      channel: latest/beta
+
 env:
   global:
+    - PATH=/snap/bin:$PATH
     - RUBY_GC_MALLOC_LIMIT=90000000
     - RUBY_GC_HEAP_FREE_SLOTS=200000
     - CI_NODE_TOTAL=3
@@ -32,4 +38,4 @@ jobs:
       install: echo skip
       before_script: echo skip
       script: make ship
-      if: commit_message =~ /ship:docker/ OR env(SHIP_DOCKER) = true
+      if: commit_message =~ /ship:docker/ OR env(SHIP_DOCKER) = true or branch = master

Makefile

@@ -48,7 +48,7 @@ docker-push-branch:
 .PHONY: ship
 ship: docker-build docker-login
 
-ifeq ($(BRANCH),master)
+ifeq ($(TRAVIS_BRANCH),master)
 ifeq ($(TRAVIS_PULL_REQUEST),false)
 ship: docker-push-latest-master
 endif