build succeeds and docker image can be run

Author: Topi Paavilainen

Dockerfile

@@ -1,8 +1,7 @@
-FROM ubuntu:latest
+FROM ubuntu:16.04
+MAINTAINER Topi Paavilainen <topi.paavilainen@futurice.com>
 
-COPY . /
-
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+WORKDIR /opt/app
 
 
 ### APT-GET ###
@@ -19,18 +18,21 @@ RUN apt-get install -y \
 	postgresql libpq-dev \
 	npm \
 	memcached \
+	openjdk-8-jdk \
 	supervisor
 
 RUN ln -s /usr/bin/nodejs /usr/bin/node
 
 
 ### DEPENDENCIES ### 
 
+COPY requirements.txt /opt/app/
 RUN apt-get install -y libffi-dev && pip install -r requirements.txt
-RUN npm install
 
+COPY . /opt/app/
+RUN npm install
 
-### POSTGRES ####
+### POSTGRES ###
 
 RUN mkdir -p media/portraits/full media/portraits/thumb media/portraits/badge
 USER postgres
@@ -46,13 +48,16 @@ RUN /etc/init.d/postgresql start &&\
 
 ### SOLR ###
 
+RUN apt-get install -y wget unzip
+RUN wget -q http://archive.apache.org/dist/lucene/solr/3.6.2/apache-solr-3.6.2.zip
+RUN unzip apache-solr-3.6.2.zip
+RUN ./manage.py build_solr_schema > schema.xml
+RUN cp schema.xml apache-solr-3.6.2/example/solr/conf/
+RUN cp apache-solr-3.6.2/example/solr/conf/stopwords.txt apache-solr-3.6.2/example/solr/conf/stopwords_en.txt
+RUN export PATH=$PATH:/apache-solr-3.6.2/example/solr/conf/
 
 
-
-###
-
-
-
-EXPOSE 8000
+EXPOSE 8080
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

fum/settings/base.py

@@ -93,7 +93,7 @@
 
     'django_extensions',
     'crispy_forms',
-    #'haystack',
+    'haystack',
     'djangohistory',
     'rest_framework',
     'rest_framework_docs',
@@ -203,7 +203,7 @@
 
 # LDAP
 import ldap
-USE_TLS = True
+USE_TLS = False
 LDAP_CLASS = 'fum.ldap_helpers.PoolLDAPBridge'
 LDAP_RETRY_DELAY = 1
 LDAP_RETRY_MAX = 3

supervisord.conf

@@ -3,6 +3,12 @@ nodaemon=true
 
 [program:fum]
 command: ./manage.py runserver --nostatic 0.0.0.0:8080
+environment=REMOTE_USER="emkos_test01"
 
 [program:postgres]
 command: service postgresql restart
+
+[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/