re-add github support

This commit is contained in:
Christine Dodrill 2015-02-06 16:16:46 -08:00
parent b1802de21e
commit 0f93585ceb
3 changed files with 8 additions and 9 deletions

View File

@ -1,4 +1,5 @@
GIT_REV=`git rev-parse HEAD`
GITHUB_TOKEN=`cat ~/.token`
.PHONY: build test oleg
@ -11,4 +12,4 @@ oleg:
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) xena/site /bin/bash
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

View File

@ -3,7 +3,12 @@ name: "christine"
overlay:
- apt-get update
- apt-get install -y lua-sec
- apt-get install -y lua-discount
dependencies:
- https://rocks.moonscript.org/manifests/luarocks/markdown-0.32-2.rockspec
- https://rocks.moonscript.org/manifests/dhkolf/dkjson-2.5-1.rockspec
- https://rocks.moonscript.org/manifests/leafo/lapis-1.1.0-1.rockspec
- https://rocks.moonscript.org/manifests/luarocks/luasocket-3.0rc1-1.rockspec
- https://github.com/lusis/lua-httpclient/blob/master/httpclient-0.1.0-7.rockspec
- https://raw.githubusercontent.com/lusis/lua-github/master/github-0.0.2-1.rockspec
- https://rocks.moonscript.org/manifests/luarocks/lbase64-20120820-1.rockspec

View File

@ -49,13 +49,6 @@ http {
alias static/keybase.txt;
}
location /capture {
internal;
resolver 8.8.8.8;
set_unescape_uri $clean_url $arg_url;
proxy_pass $clean_url;
}
location /proxy {
internal;
rewrite_by_lua "