cadey
/
site
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move init stuff to init/ 

Makefile: expose olegdb for testing
This commit is contained in:
Christine Dodrill 2015-02-13 12:22:33 -08:00
parent 81817d2731
commit fa3142ca31
5 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,5 +1,5 @@
FROM xena/lapis:1.7.7.2 FROM xena/lapis:1.7.7.2
ADD oleg /seed/oleg ADD init/oleg /seed/oleg
RUN mv /seed/oleg/olegdb.conf /oleg/db.conf RUN mv /seed/oleg/olegdb.conf /oleg/db.conf
ADD oleg/runit/ /etc/service ADD init/oleg/runit/ /etc/service

2
Makefile
View File

@ -9,7 +9,7 @@ build:
test: build test: build
@echo "http://127.0.0.1:5000" @echo "http://127.0.0.1:5000"
@echo "press ^C to kill the test server" @echo "press ^C to kill the test server"
docker run -p 5000:5000 --name site-$(GIT_REV) --rm -it -e GIT_REV=$(GIT_REV) -e GITHUB_TOKEN=$(GITHUB_TOKEN) xena/site /bin/bash docker run -p 5001:38080 -p 5000:5000 --name site-$(GIT_REV) --rm -it -e GIT_REV=$(GIT_REV) -e GITHUB_TOKEN=$(GITHUB_TOKEN) xena/site /bin/bash
deploy: deploy:
git push git push

0
oleg/olegdb.conf → init/oleg/olegdb.conf
View File

0
oleg/runit/olegdb/run → init/oleg/runit/olegdb/run
View File

0
oleg/seed.sh → init/oleg/seed.sh
View File