From d22288ccdadb14d9bf531d77d06466d778906e3a Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sat, 7 Feb 2015 11:49:53 -0800 Subject: [PATCH] Add `make deploy` --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b499a05..84f0941 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,17 @@ GIT_REV=`git rev-parse HEAD` GITHUB_TOKEN=`cat ~/.token` -.PHONY: build test oleg +.PHONY: build test deploy build: docker build -t xena/site . -oleg: - docker run -ditv /home/xena/tmp/oleg/site:/oleg/data --name site-olegdb xena/olegdb - test: build @echo "http://127.0.0.1:5000" @echo "press ^C to kill the test server" docker run -p 5000:5000 --name site-$(GIT_REV) --link site-olegdb:oleg --rm -it -e GIT_REV=$(GIT_REV) -e GITHUB_TOKEN=$(GITHUB_TOKEN) xena/site /bin/bash + +deploy: + git push + git push git@github.com:Xe/christine.website master + git push dokku master