Merge branch 'dokker' into dock-translations

docker/Dockerfile

 FROM httpd:2.4
 
+
+# Configure httpd
+# ----------------
+
 COPY httpd.conf /usr/local/apache2/conf/httpd.conf
-COPY test.cgi /usr/local/apache2/cgi-bin/
+# COPY test.cgi /usr/local/apache2/cgi-bin/
+# RUN chmod a+x  /usr/local/apache2/cgi-bin/test.cgi
+
 
-RUN chmod a+x  /usr/local/apache2/cgi-bin/test.cgi
+# Install packages
+# -----------------
 
 RUN apt-get -y update && apt-get install -y \
 apt-utils \
+autoconf \
+bison \
+build-essential \
+curl \
+flex \
+g++ \
+gcc \
+git
+less \
+libc6-dev \
+libglib2.0-0 \
+libglib2.0-dev \
+libncurses5-dev \
+libpcre3-dev \
+libreadline6 \
+libreadline6-dev \
+make \
+pkg-config \
 python \
 python-mysqldb \
 subversion \
-autoconf bison flex gcc pkg-config libc6-dev libncurses5-dev make libpcre3-dev libglib2.0-0 libglib2.0-dev libreadline6 libreadline6-dev zip curl less \
-build-essential g++ git
+zip \
+
+
+# Install Corpus WorkBench
+# -------------------------
 
 RUN svn co http://cwb.svn.sourceforge.net/svnroot/cwb/cwb/trunk cwb
 COPY cwb-install-ubuntu /cwb/install-scripts/cwb-install-ubuntu
 RUN /cwb/install-scripts/cwb-install-ubuntu
 
-ADD https://svn.spraakdata.gu.se/repos/lb/trunk/sbkhs/pub/korp_backend.zip /usr/local/apache2/cgi-bin
+# Install and configure KORP backend
+# -----------------------------------
 
+ADD https://svn.spraakdata.gu.se/repos/lb/trunk/sbkhs/pub/korp_backend.zip /usr/local/apache2/cgi-bin
 RUN unzip /usr/local/apache2/cgi-bin/korp_backend.zip -d /usr/local/apache2/cgi-bin/
-
 COPY korp_config.py /usr/local/apache2/cgi-bin/korp_config.py
 
+
 # Test with TEST corpus
+# ---------------------
 
 RUN mkdir -p /corpora/data/testcorpus
 RUN mkdir -p /corpora/registry
@@ -33,22 +64,28 @@ RUN /usr/local/cwb-3.4.11/bin/cwb-makeall -V -r /corpora/registry TESTCORPUS
 
 COPY testinfo.txt /corpora/data/testcorpus/.info
 
+
+# Install KORP frontend
+# ----------------------
+
 RUN mkdir -p /usr/local/apache2/htdocs/korp
+
 #ADD https://svn.spraakdata.gu.se/repos/lb/trunk/sbkhs/pub/korp_frontend.zip /usr/local/apache2/htdocs/korp
 #RUN unzip /usr/local/apache2/htdocs/korp/korp_frontend.zip -d /usr/local/apache2/htdocs/korp
 
-# last dev version
-#COPY ../../uuskorp/korp /usr/local/apache2/htdocs/
-
 RUN git clone http://spraakbanken.gu.se/pub/korp.git htdocs/korp
 
 
+# Install nodejs
+# ---------------
 
-### Nodendus
 RUN cd /root && curl -sL https://deb.nodesource.com/setup_6.x -o nodesource_setup.sh && bash nodesource_setup.sh
-
 RUN apt-get install nodejs
 
+
+# Customise KORP frontend
+# ------------------------
+
 COPY korp/app/img/EKRK_logo_lyhend.png htdocs/korp/app/img
 COPY korp/app/index.jade htdocs/korp/app
 COPY korp/app/config.js htdocs/korp/app
@@ -59,8 +96,19 @@ COPY korp/app/translations/*-en.json htdocs/korp/app/translations/
 COPY korp/app/translations/*-fi.json htdocs/korp/app/translations/
 COPY korp/app/translations/*-sv.json htdocs/korp/app/translations/
 
+
+# Install jade
+# -------------
+
 RUN npm install jade -g
-RUN cd htdocs/korp/app && jade index.jade -P
 
-#ENTRYPOINT ["/bin/bash"]
 
+# Make index.html
+# ----------------
+
+RUN cd htdocs/korp/app && jade index.jade -P
+
+# Do not make entrypoint, use
+# docker exec -it <containerIdOrName> /bin/bash
+# instead.
+## ENTRYPOINT ["/bin/bash"]

docker/korp/app/config.js

@@ -134,10 +134,10 @@ settings.modeConfig = [
         localekey: "interfra",
         mode: "interfra"
     },
-    {
-        localekey: "bellman",
-        mode: "bellman"
-    },
+    // {
+    //     localekey: "bellman",
+    //     mode: "bellman"
+    // },
     {
         localekey: "eddan",
         mode: "eddan"