From d8f1665dc604df725a046feeb989084f83057fe3 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <jp@eeqj.com>
Date: Tue, 12 Nov 2019 21:24:58 -0800
Subject: [PATCH] add circleci config and update makefile for ci

---
 .circleci/config.yml | 11 +++++++++++
 Makefile             | 28 ++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..4a81566
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,11 @@
+version: 2
+jobs:
+ build:
+   machine: true
+   steps:
+     - checkout
+     - run: make dist
+     - store_artifacts:
+         path: output
+     - run: echo "$DOCKER_PASS" | docker login --username $DOCKER_USER --password-stdin
+     - run: make ci-upload-images
diff --git a/Makefile b/Makefile
index da4fd4b..8894dc2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,27 @@
-default: build
+APPNAME := docker-linux-vm
+IMAGENAME := sneak/$(APPNAME)
+BUILDTIMEFILENAME := $(shell date -u '+%Y%m%d-%H%M%SZ')
 
-build:
-	docker build -t sneak/docker-linux-vm .
+default: build-docker-image
 
 run:
-	docker run -ti sneak/docker-linux-vm
+	docker run -ti $(IMAGENAME)
+
+dist: build-docker-image
+	-mkdir -p ./output
+	docker save $(IMAGENAME) | bzip2 > output/$(BUILDTIMEFILENAME).$(APPNAME).tbz2
+
+hub: upload-docker-image
+
+build-docker-image:
+	docker build -t $(IMAGENAME) .
+
+upload-docker-image: build-docker-image
+	docker tag $(IMAGENAME) $(IMAGENAME):$(BUILDTIMETAG)
+	docker push $(IMAGENAME):$(BUILDTIMETAG)
+
+ci-upload-images:
+	docker tag $(IMAGENAME) $(IMAGENAME):$(CIRCLE_SHA1)
+	docker tag $(IMAGENAME) $(IMAGENAME):$(CIRCLE_BRANCH)
+	docker push $(IMAGENAME):$(CIRCLE_SHA1)
+	docker push $(IMAGENAME):$(CIRCLE_BRANCH)