Merge pull request #402 from dshulyak/use_git

Use pip+git to install solar and solar-agent in Dockerfile
Mirantis · Dec 2, 2015 · 38f79d8 · 38f79d8
2 parents c5b9783 + ee674c5
commit 38f79d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,11 +9,11 @@ ADD run.sh /run.sh
 
 RUN apt-get update
 RUN apt-get install -y python python-dev python-distribute python-pip \
-    libyaml-dev vim libffi-dev libssl-dev
+    libyaml-dev vim libffi-dev libssl-dev git
 RUN pip install ansible
 
-RUN pip install https://github.com/Mirantis/solar/archive/master.zip
-RUN pip install https://github.com/Mirantis/solar-agent/archive/master.zip
+RUN pip install git+https://github.com/Mirantis/solar.git
+RUN pip install git+https://github.com/Mirantis/solar-agent.git
 
 RUN ansible-playbook -v -i "localhost," -c local /celery.yaml --tags install
 

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,6 @@
 [metadata]
 name = solar
+version = 0.0.1
 author = Mirantis Inc.
 author-email = product@mirantis.com
 summary = Deployment tool