Update the tangodb image (do not use the sardemo one)

piertoni · Jan 20, 2017 · af7342e · af7342e
1 parent 5d99e47
commit af7342e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get install -y tango-db
 #install tango-test DS
 RUN apt-get install -y tango-test
 
-# install sardana dependencies
+# install taurus dependencies
 RUN apt-get install -y python ipython python-h5py python-lxml python-numpy\ 
                        python-nxs python-ply python-tango python-qt4\ 
                        python-guiqwt python-spyder python-qwt5-qt4
@@ -44,9 +44,8 @@ ENV DISPLAY=:1.0
 # configure supervisord
 COPY supervisord.conf /etc/supervisor/conf.d/
 
-# TODO: use just basic database, not the one with sardemo
-# copy & untar mysql tango database (with sardemo) and change owner to mysql user
-ADD tangodbsardemo.tar /var/lib/mysql/
+# copy & untar mysql tango database and change owner to mysql user
+ADD tangodb-tiny.tar /var/lib/mysql/
 RUN chown -R mysql /var/lib/mysql/tango
 
 # define tango host env var

diff --git a/supervisord.conf b/supervisord.conf
@@ -2,7 +2,7 @@
 nodaemon=true
 
 [program:mysqld]
-command=/usr/sbin/mysqld
+command=sevice mysql start
 priority=1
 
 [program:tango-db]

diff --git a/tangodbsardemo.tar → tangodb-tiny.tar b/tangodbsardemo.tar → tangodb-tiny.tar