Merge pull request #18 from binary-sequence-dockerized-apps/postgresql

webui now uses postgresql

Author: SergioAtSUSE

webui/Dockerfile

@@ -1,23 +1,35 @@
 FROM opensuse:tumbleweed
 LABEL maintainer Sergio Lindo Mansilla <slindomansilla@suse.com>
-LABEL version="2017-11-25"
+LABEL version="2017-12-11"
 
 RUN zypper --gpg-auto-import-keys ref
-RUN zypper --non-interactive in --force-resolution apache2
-RUN zypper --non-interactive in --force-resolution w3m
-RUN zypper --non-interactive in --force-resolution which
-RUN zypper --non-interactive in --force-resolution openQA
+RUN zypper --non-interactive install --force-resolution apache2
+RUN zypper --non-interactive install --force-resolution perl-DateTime-Format-Pg
+RUN zypper --non-interactive install --force-resolution perl-DBD-Pg
+RUN zypper --non-interactive install --force-resolution postgresql
+RUN zypper --non-interactive install --force-resolution postgresql-server
+RUN zypper --non-interactive install --force-resolution w3m
+RUN zypper --non-interactive install --force-resolution which
+RUN zypper --non-interactive install --force-resolution openQA
 
 RUN a2enmod headers
 RUN a2enmod proxy
 RUN a2enmod proxy_http
 RUN a2enmod proxy_wstunnel
 
 # Config
-RUN mkdir -p /run/dbus
+RUN mkdir --parents /run/dbus
 RUN echo ServerName localhost >> /etc/apache2/httpd.conf
 RUN cp /etc/apache2/vhosts.d/openqa.conf.template /etc/apache2/vhosts.d/openqa.conf
+USER postgres
+RUN /usr/share/postgresql/postgresql-script start && \
+    createuser geekotest && \
+    createdb openqa && \
+    psql --command='GRANT ALL PRIVILEGES ON DATABASE openqa TO geekotest;' && \
+    /usr/share/postgresql/postgresql-script stop
+USER root
 ADD client.conf /etc/openqa/
+ADD database.ini /etc/openqa
 ADD openqa.ini /etc/openqa/
 ADD rsyncd.conf /etc/
 

webui/database.ini

@@ -0,0 +1,5 @@
+[test]
+dsn = dbi:Pg:dbname=openqa
+
+[production]
+dsn = dbi:Pg:dbname=openqa

webui/run_openqa.sh

@@ -4,16 +4,12 @@ export DBUS_STARTER_BUS_TYPE=system
 
 # prepare environment
 rm -f /run/dbus/pid
-if [ ! -f /data/db/db.sqlite ]; then
-  /usr/share/openqa/script/initdb --user geekotest --init_database
-else
-  /usr/share/openqa/script/upgradedb --user geekotest --upgrade_database
-fi
 
 # run services
 dbus-daemon --system --fork
+start_daemon -u postgres  /usr/share/postgresql/postgresql-script start &
+start_daemon -u root      /usr/sbin/rsyncd --daemon --no-detach &
 start_daemon -u geekotest /usr/share/openqa/script/openqa-resource-allocator &
-start_daemon /usr/sbin/rsyncd --daemon --no-detach &
 start_daemon -u geekotest /usr/share/openqa/script/openqa-scheduler &
 start_daemon -u geekotest /usr/share/openqa/script/openqa-websockets &
 start_daemon -u geekotest /usr/share/openqa/script/openqa gru -m production run &