vagrant-related files removed, docker-related files moved to docker/

Author: Topi Paavilainen

Dockerfile

@@ -54,6 +54,6 @@ RUN export PATH=$PATH:/apache-solr-3.6.2/example/solr/conf/
 
 
 EXPOSE 8000
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
-CMD ["bash", "start.sh"]
+CMD ["bash", "docker/start.sh"]

docker/start.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+/etc/init.d/postgresql start &&\
+	./manage.py migrate --noinput &&\
+	./manage.py datamigrate &&\
+	./manage.py collectstatic --noinput
+
+/etc/init.d/postgresql stop
+
+/usr/bin/supervisord -c /etc/supervisor/supervisord.conf

docker/supervisord.conf

@@ -0,0 +1,14 @@
+[supervisord]
+nodaemon=true
+
+[program:fum]
+command: ./manage.py runserver --nostatic 0.0.0.0:8000
+environment=REMOTE_USER="emkos_test01"
+
+[program:postgres]
+command: /etc/init.d/postgresql start 
+
+[program:solr]
+command: java -jar start.jar
+directory: /opt/app/apache-solr-3.6.2/example/
+environment=PATH=$PATH:/opt/app/apache-solr-3.6.2/example/solr/conf/