Merge branch 'master' of https://github.com/cgrates/cgrates

data/docker/devel/Dockerfile

@@ -10,7 +10,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-key D76EDC7725E010CF && gpg -
 # add freeswitch apt repo
 RUN echo 'deb http://files.freeswitch.org/repo/deb/debian/ jessie main' > /etc/apt/sources.list.d/freeswitch.list
     
-# install dependency
+# install dependencies
 RUN apt-get -y update && apt-get -y install git bzr mercurial redis-server mysql-server python-pycurl python-mysqldb postgresql postgresql-client sudo wget freeswitch-meta-vanilla
 
 # add cgrates user

data/docker/devel/start.sh

@@ -24,5 +24,5 @@ ln -s /root/code/bin/cgr-engine /usr/bin/cgr-engine
 # expand freeswitch conf
 cd /usr/share/cgrates/tutorials/fs_evsock/freeswitch/etc/ && tar xzf freeswitch_conf.tar.gz       
 
-
+cd /root/cgr
 bash --rcfile /root/.bashrc

data/docker/prod/Dockerfile

@@ -2,39 +2,30 @@ FROM debian:latest
 MAINTAINER Radu Fericean, rif@cgrates.org
 RUN apt-get -y update
 
-# install dependencies
-RUN apt-get -y install git redis-server mysql-server python-mysqldb wget
-
+# set mysql password
+RUN echo 'mysql-server mysql-server/root_password password CGRateS.org' | debconf-set-selections && echo 'mysql-server mysql-server/root_password_again password CGRateS.org' | debconf-set-selections
+    
 # add freeswitch gpg key
-RUN gpg --keyserver pool.sks-keyservers.net --recv-key D76EDC7725E010CF
-      
-# add freeswitch apt key
-RUN gpg -a --export D76EDC7725E010CF | apt-key add -
+RUN gpg --keyserver pool.sks-keyservers.net --recv-key D76EDC7725E010CF && gpg -a --export D76EDC7725E010CF | apt-key add -
 
 # add freeswitch apt repo
-RUN cd /etc/apt/sources.list.d/; wget http://apt.itsyscom.com/conf/freeswitch.apt.list
-      
-# install freeswitch
-RUN apt-get update; apt-get -y install freeswitch-meta-vanilla freeswitch-mod-json-cdr
+RUN echo 'deb http://files.freeswitch.org/repo/deb/debian/ jessie main' > /etc/apt/sources.list.d/freeswitch.list
+
+# install dependencies
+RUN apt-get update && apt-get -y install redis-server mysql-server python-pycurl python-mysqldb postgresql postgresql-client sudo wget git freeswitch-meta-vanilla
 
 # add cgrates apt-key
-RUN wget -O - http://apt.itsyscom.com/conf/cgrates.gpg.key | apt-key add -
+RUN wget -qO- http://apt.itsyscom.com/conf/cgrates.gpg.key | apt-key add -
 
 # add cgrates repo
-RUN cd /etc/apt/sources.list.d/; wget http://apt.itsyscom.com/conf/cgrates.apt.list
+RUN cd /etc/apt/sources.list.d/; wget -q http://apt.itsyscom.com/conf/cgrates.apt.list
 
 # install cgrates
-RUN apt-get update; apt-get -y install cgrates
-
-# copy .my.cnf  (do not enable it)
-ADD my.cnf /my.cnf
-
-# add startup script
-ADD start.sh /root/start.sh
+RUN apt-get update && apt-get -y install cgrates
 
 # cleanup
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # set start command
-CMD /root/start.sh
+CMD /root/code/data/docker/prod/start.sh
 

data/docker/prod/README.md

@@ -0,0 +1,11 @@
+Docker
+=======
+
+From the project root:
+
+``` bash
+# build the image
+docker build -t cgrates data/docker/prod
+# create the container
+docker run --rm -itv `pwd`:/root/code --name cgr cgrates
+```

data/docker/prod/start.sh

@@ -1,6 +1,11 @@
 /etc/init.d/mysql start
-/usr/share/cgrates/tutorials/fs_csv/freeswitch/etc/init.d/freeswitch start
-mysqladmin -u root password CGRateS.org
-cd /usr/share/cgrates/storage/mysql; ./setup_cgr_db.sh root CGRateS.org localhost
-cd /
+/etc/init.d/postgresql start
+/etc/init.d/redis-server start
+
+cd /usr/share/cgrates/storage/mysql && ./setup_cgr_db.sh root CGRateS.org
+cd /usr/share/cgrates/storage/postgres && ./setup_cgr_db.sh
+
+/usr/share/cgrates/tutorials/fs_evsock/freeswitch/etc/init.d/freeswitch start
+/usr/share/cgrates/tutorials/fs_evsock/cgrates/etc/init.d/cgrates start
+
 bash --rcfile /root/.bashrc