From ec88e497fac7abffb4f18adfbb08d7ee11e4cdc2 Mon Sep 17 00:00:00 2001
From: Bumsik Kim <k.bumsik@gmail.com>
Date: Sun, 17 Jun 2018 20:14:40 -0400
Subject: [PATCH] Added Travis CI

---
 .travis.yml                             | 24 +++++++++++++++++
 package/debian/Dockerfile => Dockerfile |  2 +-
 Makefile                                | 34 ++++++++++++++++---------
 package/debian/Makefile.virtualenv      |  1 -
 4 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 .travis.yml
 rename package/debian/Dockerfile => Dockerfile (97%)

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..488b2bd
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,24 @@
+sudo: required
+
+services:
+- docker
+
+install:
+- if [[ -z "${TRAVIS_TAG}" ]]; then
+- make docker-pull
+- fi
+
+script:
+- if [[ -z "${TRAVIS_TAG}" ]]; then
+- make docker-env-build
+- fi
+
+deploy:
+  provider: releases
+  api_key:
+    secure: zFbsCIKcsvWU/Yc+9k294Qj8QY48VlkV8DSScP5gz6dQegeUSaSHI/YafherkFQ0B03bIY8yc7roMtDo7HAkEnPptjFhdUiOFI11+xDVb3s7Y8Ek2nV3znQzdtR4CR/94l3in6R3DH+eNA6+6Je/NIWLdVcvRX07RBSfBVdPmnsAyAD9KNTsl8Q4c20HgtLNxfWv2s5eCyD+heCTLYrErEZKZ5vYeeANmWomHvT2ED/4QerpBP8wkh59QXD1S79CF7oyq6X173ZJUQVxdBP+OSXt/mDBAoqf+TV6okawRZn48JluvCWAJ7BceX7t9emd1rVI/s8t3wCP+eMcmNn5g/6UJaCPnTJ5YplTuUWRc63UFSkE0AY8WYcRlrz+/OiXYgQ8LMXfN23aWgarHCbS2vHR3Afu9gpLCoKucr36hKhs3zfjJzVLFFW16mnbaTFcBzfDDRpkvOANB1aZwGVRFpTIWIMjkn0+lxWTC/moIJvQlfRPsC4dN5cDAilRQlguHzayebtGE8X0PuIe9A8bkET3V/y+KPnQiSJ7J+5PNoDSdqRAE4IKvVOLEyHtlqBVkvIHKnugUnWPIZ21gm5RemMEj9/YGa8Efwz7PIKtJJ3kFMGDYKVlIKyB+rg/TFWNdo6jjevnWM6y4SfVI3kFyjA+mp31o6nshrQy0zVQpd8=
+  file:
+    - package/debian/build/virtscreen_0.2.0-1_all.deb
+  on:
+    tags: true
+    repo: kbumsik/VirtScreen
diff --git a/package/debian/Dockerfile b/Dockerfile
similarity index 97%
rename from package/debian/Dockerfile
rename to Dockerfile
index 6d1e111..b072ba5 100644
--- a/package/debian/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Or bionic
-FROM ubuntu:latest
+FROM ubuntu:bionic
 LABEL author="Bumsik Kim <k.bumsik@gmail.com>"
 
 WORKDIR /app
diff --git a/Makefile b/Makefile
index 2494db8..83964c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 # See https://packaging.python.org/tutorials/distributing-packages/#packaging-your-project
 # for python packaging reference.
 
+DOCKER_NAME=kbumsik/virtscreen
+
 .PHONY:
 
 python-wheel:
@@ -20,32 +22,40 @@ pip-upload: python-wheel
 
 .ONESHELL:
 
-# For Debian packaging, https://www.debian.org/doc/manuals/debmake-doc/ch08.en.html#setup-py
-deb-docker-build:
-	docker build -f package/debian/Dockerfile -t debmake .
+# Docker
+docker-build:
+	docker build -f Dockerfile -t $(DOCKER_NAME) .
 
-deb-docker:
-	docker run --privileged --interactive --tty -v $(shell pwd)/package/debian:/app debmake /bin/bash
+docker:
+	docker run --interactive --tty -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /bin/bash
 	
-deb-docker-rm:
-	docker image rm -f debmake
+docker-rm:
+	docker image rm -f $(DOCKER_NAME)
 
+docker-pull:
+	docker pull $(DOCKER_NAME)
+
+docker-push:
+	docker login
+	docker push $(DOCKER_NAME)
+
+# For Debian packaging, https://www.debian.org/doc/manuals/debmake-doc/ch08.en.html#setup-py
 deb-make:
-	docker run --privileged --interactive --tty --rm -v $(shell pwd)/package/debian:/app debmake /app/debmake.sh
+	docker run -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /app/debmake.sh
 
 deb-build: deb-clean deb-make
 	package/debian/copy_debian.sh
-	docker run --privileged --interactive --tty --rm -v $(shell pwd)/package/debian:/app debmake /app/debuild.sh
+	docker run -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /app/debuild.sh
 
 deb-contents:
-	docker run --privileged --interactive --tty --rm -v $(shell pwd)/package/debian:/app debmake /app/contents.sh
+	docker run -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /app/contents.sh
 
 deb-env-make:
-	docker run --privileged --interactive --tty --rm -v $(shell pwd)/package/debian:/app debmake /app/debmake.sh virtualenv
+	docker run -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /app/debmake.sh virtualenv
 
 deb-env-build: deb-clean deb-env-make
 	package/debian/copy_debian.sh virtualenv
-	docker run --privileged --interactive --tty --rm -v $(shell pwd)/package/debian:/app debmake /app/debuild.sh virtualenv
+	docker run -v $(shell pwd)/package/debian:/app $(DOCKER_NAME) /app/debuild.sh virtualenv
 
 deb-clean:
 	rm -rf package/debian/build
diff --git a/package/debian/Makefile.virtualenv b/package/debian/Makefile.virtualenv
index 3029ace..c8a46ab 100644
--- a/package/debian/Makefile.virtualenv
+++ b/package/debian/Makefile.virtualenv
@@ -7,7 +7,6 @@ SHELL = /bin/bash
 install:
 	# Create virtualenv
 	install -d $(DESTDIR)$(prefix)/share/virtscreen
-	virtualenv $(DESTDIR)$(prefix)/share/virtscreen/env --always-copy
 	source $(HOME)/miniconda/bin/activate && \
 		conda create -y --copy --prefix $(DESTDIR)$(prefix)/share/virtscreen/env python=3.6
 	source $(HOME)/miniconda/bin/activate && \