update to use mariadb and ubuntu:16.04 image

Author: hlainchb

Dockerfile

@@ -2,55 +2,40 @@
 # dockerfile for datazoomer
 #
 
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 MAINTAINER Herb Lainchbury <herb@dynamic-solutions.com>
 
-
 # install os packages
 RUN apt-get update
 RUN apt-get -y install \
     apache2 \
     git \
-    mysql-client \
-    mysql-server \
+    vim \
     python-imaging \
-    python-MySQLdb \
+    python-mysqldb \
     python-pip \
     libxml2-dev \
     libxslt1-dev \
     libffi-dev \
     libssl-dev \
     python-dev
 
-
 # configure apache modules
-RUN cd /etc/apache2/mods-enabled && sudo ln -s ../mods-available/rewrite.load
-RUN cd /etc/apache2/mods-enabled && sudo ln -s ../mods-available/cgi.load
-
-
-# install pip and python libraries
-RUN pip install --upgrade pip
-RUN pip install \
-    BeautifulSoup \
-    markdown \
-    nose \
-    faker \
-    pyrss2gen \
-    bcrypt \
-    scrypt
-run pip install -Iv passlib==1.6.2
+RUN cd /etc/apache2/mods-enabled && ln -s ../mods-available/rewrite.load
+RUN cd /etc/apache2/mods-enabled && ln -s ../mods-available/cgi.load
 
+# install mariadb
+ADD setup_mariadb.sh /tmp/setup_mariadb.sh
+RUN /bin/bash /tmp/setup_mariadb.sh
 
 # upload scripts
 ADD setup.sh /tmp/setup.sh
 ADD start.sh /tmp/start.sh
 
-
 # run the final setup
 RUN /bin/bash /tmp/setup.sh
 
-
 # run the server
 EXPOSE 80
 CMD ["/bin/bash", "/tmp/start.sh"]

setup.sh

@@ -24,6 +24,7 @@ mv dsi.pth /usr/local/lib/python2.7/dist-packages
 
 # install datazoomer library
 git clone https://github.com/dsilabs/datazoomer.git /work/source/libs/datazoomer
+pip install -r /work/source/libs/datazoomer/requirements.txt
 ln -s /work/source/libs/datazoomer/zoom /work/lib
 
 # setup the default theme
@@ -35,10 +36,21 @@ rm -f 000-default*
 ln -s /work/source/libs/datazoomer/setup/apache/zoom zoom.conf
 sed -i'' 's/Listen 80/ServerName localhost\n\nlisten 80/' /etc/apache2/ports.conf
 
+apt-get install vim
+
 # setup datazoomer config files
 echo -e "[sites]\\npath=/work/web/sites" > /work/dz.conf
 echo -e "[sites]\\npath=/work/web/sites" > /work/web/dz.conf
 cp /work/source/libs/datazoomer/sites/default/site.ini /work/web/sites/default/site.ini
+mkdir /work/web/sites/localhost
+cat <<EOT | tee "/work/web/sites/localhost/site.ini"
+[database]
+engine=mysql
+dbname=zoomdata
+dbhost=localhost
+dbuser=zoomuser
+dbpass=zoompass
+EOT
 
 # setup the www server folder
 ln -s /work/source/libs/datazoomer/setup/www/static/dz /work/web/www/static

setup_mariadb.sh

@@ -0,0 +1,9 @@
+
+# setup mariadb
+apt-get install software-properties-common
+apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8
+add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://mariadb.mirror.colo-serv.net/repo/10.1/ubuntu xenial main'
+apt-get update
+echo mariadb-server-10.1 mysql-server/root_password password root | debconf-set-selections
+echo mariadb-server-10.1 mysql-server/root_password_again password root | debconf-set-selections
+apt-get -y -q install mariadb-server

start.sh

@@ -1,8 +1,10 @@
 
 # create database
 service mysql start
-echo "create database zoomdata" | mysql -u root
-mysql -u root zoomdata < /work/source/libs/datazoomer/setup/database/setup_mysql.sql
+echo "create database zoomdata" | mysql -u root -proot
+mysql -u root -proot zoomdata < /work/source/libs/datazoomer/setup/database/setup_mysql.sql
+mysql -u root -proot -e "create user zoomuser identified by 'zoompass'"
+mysql -u root -proot -e "grant all on zoomdata.* to zoomuser@'%'"
 
 # start apache
 /usr/sbin/apache2ctl -D FOREGROUND