From 705d3402b6da2aa84ceb870aa7517c73ced6009c Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Wed, 3 Jun 2020 13:16:15 -0700
Subject: [PATCH] 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                   |  8 --------
 contrib/dnsmasq/Makefile      | 18 ++----------------
 contrib/dnsmasq/travis-deploy | 11 -----------
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100755 contrib/dnsmasq/travis-deploy

diff --git a/.travis.yml b/.travis.yml
index 7065a8fa..972fd5f4 100644
--- a/.travis.yml
+++ b/.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
diff --git a/contrib/dnsmasq/Makefile b/contrib/dnsmasq/Makefile
index c6c3de3b..b10a8a16 100644
--- a/contrib/dnsmasq/Makefile
+++ b/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)
diff --git a/contrib/dnsmasq/travis-deploy b/contrib/dnsmasq/travis-deploy
deleted file mode 100755
index 0ca8726d..00000000
--- a/contrib/dnsmasq/travis-deploy
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# dirty hack
-cd "$(dirname $0)"
-
-docker info
-make docker-image
-docker login -u="$DOCKER_USERNAME" -p=$DOCKER_PASSWORD quay.io
-make docker-push
-