Change dnsmasq container image publishing

* Use our own infra to perform image builds and push images. Provides
  future options for publishing images to multiple image registries and
for multiple architectures, while keeping push permissions in-house
* Remove Travis ability to push to Quay
* Consider splitting repo and also enabling Quay automated builds

.travis.yml

@@ -10,13 +10,5 @@ install:
  - GO111MODULE=off go get golang.org/x/lint/golint
 script:
  - make
-deploy:
- - provider: script
- script: contrib/dnsmasq/travis-deploy
- skip_cleanup: true
- on:
- branch: dnsmasq
- # pick one, so travis deploys once
- go: '1.13.x'
 notifications:
  email: change

contrib/dnsmasq/Makefile

@@ -5,14 +5,14 @@ LOCAL_REPO=poseidon/dnsmasq
 IMAGE_REPO=quay.io/poseidon/dnsmasq
 
 .PHONY: all
-all: docker-image
+all: image
 
 .PHONY: tftp
 tftp:
  @$(DIR)/get-tftp-files
 
 .PHONY: image
-image:
+image: tftp
  @buildah bud -t $(LOCAL_REPO):$(VERSION) .
  @buildah tag $(LOCAL_REPO):$(VERSION) $(LOCAL_REPO):latest
 
@@ -22,17 +22,3 @@ push:
  @buildah tag $(LOCAL_REPO):$(VERSION) $(IMAGE_REPO):latest
  @buildah push docker://$(IMAGE_REPO):$(VERSION)
  @buildah push docker://$(IMAGE_REPO):latest
-
-# for travis-only
-
-.PHONY: docker-image
-docker-image: tftp
- @sudo docker build --rm=true -t $(LOCAL_REPO):$(VERSION) .
- @sudo docker tag $(LOCAL_REPO):$(VERSION) $(LOCAL_REPO):latest
-
-.PHONY: docker-push
-docker-push:
- @sudo docker tag $(LOCAL_REPO):$(VERSION) $(IMAGE_REPO):latest
- @sudo docker tag $(LOCAL_REPO):$(VERSION) $(IMAGE_REPO):$(VERSION)
- @sudo docker push $(IMAGE_REPO):latest
- @sudo docker push $(IMAGE_REPO):$(VERSION)