From 425f319289c97844c5a22f046548f45be4d386d1 Mon Sep 17 00:00:00 2001 From: Jay Faulkner Date: Fri, 17 Jan 2014 12:54:43 -0800 Subject: [PATCH 1/5] fix(requirements): git ssh urls changed to https --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 591011943..3ac744fbd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ Werkzeug==0.9.4 requests==2.0.0 cherrypy==3.2.4 --e git+git@github.com:racker/teeth-rest.git@c62ac56cd4273e54592768ad94bb72c7c5e92508#egg=teeth_rest +-e git+https://github.com/racker/teeth-rest.git@c62ac56cd4273e54592768ad94bb72c7c5e92508#egg=teeth_rest From 8a8d5d66919ec501e42685261d5ed85046a281b3 Mon Sep 17 00:00:00 2001 From: Jay Faulkner Date: Fri, 17 Jan 2014 12:55:30 -0800 Subject: [PATCH 2/5] add(Dockerfile): Add Dockerfile for building teeth-agent --- Dockerfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..76117bbe6 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM jayofdoom/docker-ubuntu-14.04 + +# The add is before the RUN to ensure we get the latest version of packages +# Docker will cache RUN commands, but because the SHA1 of the dir will be +# different it will not cache this layer +ADD . /tmp/teeth-agent + +# Install requirements: Python for teeth-agent, others for putting an image on disk +RUN apt-get update && apt-get -y install \ + python python-pip python-dev \ + qemu-utils parted util-linux genisoimage + +RUN pip install /tmp/teeth-agent + +ENTRYPOINT [ "/usr/local/bin/teeth-standby-agent" ] From f46d77c73c4ef128b27f5cc447b5206409e20118 Mon Sep 17 00:00:00 2001 From: Jay Faulkner Date: Fri, 17 Jan 2014 12:57:02 -0800 Subject: [PATCH 3/5] add(travis): Add config for travis-ci --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..01a1f172b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: python +env: +- TOXENV=py27 +install: +- pip install tox +script: +- tox From 563f04a03b9c4fe4e59d1cfb035d5849554424b5 Mon Sep 17 00:00:00 2001 From: Jay Faulkner Date: Fri, 17 Jan 2014 13:35:10 -0800 Subject: [PATCH 4/5] fix(travis): Specify python version --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 01a1f172b..ac2633860 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: python +python: 2.7 env: - TOXENV=py27 install: From 13f874e2801573ea0ab388616f7987e8f01b03f0 Mon Sep 17 00:00:00 2001 From: Jay Faulkner Date: Fri, 17 Jan 2014 14:53:37 -0800 Subject: [PATCH 5/5] fix(travis): We do not need env set --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac2633860..2acf19f42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: python python: 2.7 -env: -- TOXENV=py27 install: - pip install tox script: