Fix docker scripts after moving solar and soalrd

Dockerfile

@@ -8,18 +8,14 @@ RUN apt-get install -y python python-dev python-distribute python-pip
 RUN pip install ansible
 
 ADD bootstrap/playbooks/celery.yaml /celery.yaml
-ADD solar /solar
-ADD solard /solard
 ADD resources /resources
 ADD templates /templates
 ADD run.sh /run.sh
 
 
 RUN apt-get install -y libffi-dev libssl-dev
-RUN pip install riak peewee
+RUN pip install https://github.com/Mirantis/solar/archive/master.zip
-RUN pip install -U setuptools>=17.1
+RUN pip install https://github.com/Mirantis/solar-agent/archive/master.zip
-RUN cd /solar && python setup.py install
-RUN pip install git+git://github.com/Mirantis/solar-agent.git
 
 RUN ansible-playbook -v -i "localhost," -c local /celery.yaml --skip-tags slave
 

docker-compose.yml

@@ -4,14 +4,13 @@ solar-celery:
   # because solar uses absolute path to find resoruce actions files
   volumes:
     - /vagrant/.vagrant:/vagrant/.vagrant
-    - /vagrant/solar:/solar
+    - /vagrant:/solar
-    - /vagrant/solard:/solard
     - /vagrant/templates:/vagrant/templates
     - /vagrant/resources:/vagrant/resources
   environment:
-    - REDIS_HOST=10.0.0.2
+    - REDIS_HOST=redis
     - REDIS_PORT=6379
-    - RIAK_HOST=10.0.0.2
+    - RIAK_HOST=riak
     - RIAK_PORT=8087
   # links are not used for configuration because we can rely on non-container
   # based datastores

run.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
 # required for ease of development
-python setup.py develop
+if [ -d /solar ]; then
+  cd /solar && python setup.py develop
+fi
 
 #used only to start celery on docker
 ansible-playbook -v -i "localhost," -c local /celery.yaml --skip-tags slave