[4/5] git commit: Removing sudo from the docker scripts. After this you have to run these docker scripts as root user.

[ni...@apache.org]

Removing sudo from the docker scripts. After this you have to run these docker scripts as root user.


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2cec5507
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2cec5507
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2cec5507

Branch: refs/heads/master
Commit: 2cec5507cdf6600535644c0dc85fbfc8f81f90f0
Parents: 02fe8ce
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Mon Aug 25 15:22:59 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Mon Aug 25 15:22:59 2014 +0530

----------------------------------------------------------------------
 tools/stratos-docker-images/activemq/docker-build.sh | 2 +-
 tools/stratos-docker-images/activemq/docker-run.sh   | 2 +-
 tools/stratos-docker-images/mysql/docker-build.sh    | 8 ++++----
 tools/stratos-docker-images/stratos/docker-build.sh  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/2cec5507/tools/stratos-docker-images/activemq/docker-build.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-docker-images/activemq/docker-build.sh b/tools/stratos-docker-images/activemq/docker-build.sh
index eebaf21..81daa41 100755
--- a/tools/stratos-docker-images/activemq/docker-build.sh
+++ b/tools/stratos-docker-images/activemq/docker-build.sh
@@ -23,4 +23,4 @@
 #  Server configuration script for Apache Stratos
 # ----------------------------------------------------------------------------
 
-sudo docker build -t=apachestratos/activemq .
+docker build -t=apachestratos/activemq .

http://git-wip-us.apache.org/repos/asf/stratos/blob/2cec5507/tools/stratos-docker-images/activemq/docker-run.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-docker-images/activemq/docker-run.sh b/tools/stratos-docker-images/activemq/docker-run.sh
index cabfa75..197d74f 100755
--- a/tools/stratos-docker-images/activemq/docker-run.sh
+++ b/tools/stratos-docker-images/activemq/docker-run.sh
@@ -23,4 +23,4 @@
 #  Server configuration script for Apache Stratos
 # ----------------------------------------------------------------------------
 
-sudo docker run -p=61616:61616 -p=8161:8161 -d apache-stratos/activemq
+docker run -p=61616:61616 -p=8161:8161 -d apachestratos/activemq

http://git-wip-us.apache.org/repos/asf/stratos/blob/2cec5507/tools/stratos-docker-images/mysql/docker-build.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-docker-images/mysql/docker-build.sh b/tools/stratos-docker-images/mysql/docker-build.sh
index 3a6a3b3..98346d1 100755
--- a/tools/stratos-docker-images/mysql/docker-build.sh
+++ b/tools/stratos-docker-images/mysql/docker-build.sh
@@ -25,7 +25,7 @@
 # NOTE: mysql container uses--init-file option which does not like comments 
 # and likes each command on its own line
 
-cp -f /home/vagrant/stratos-source/tools/stratos-installer/resources/mysql.sql files/mysql.tmp.0
+cp -f $STRATOS_SOURCE/tools/stratos-installer/resources/mysql.sql files/mysql.tmp.0
 
 # strip singleline comments
 grep -v '^--.*$' files/mysql.tmp.0 > files/mysql.tmp.1
@@ -34,14 +34,14 @@ grep -v '^--.*$' files/mysql.tmp.0 > files/mysql.tmp.1
 perl -0777 -pe 's{/\*.*?\*/}{}gs' files/mysql.tmp.1 > files/mysql.sql
 
 # remove newlines
-sed -i ':a;N;$!ba;s/\n/ /g' files/mysql.sql
+sed -i -e ':a;N;$!ba;s/\n/ /g' files/mysql.sql
 
 # replace ; with ;\n
-sed -i 's/;/;\n/g' files/mysql.sql
+sed -i -e 's/;/;\n/g' files/mysql.sql
 
 rm files/mysql.tmp.*
 
 ### build docker
 
-sudo docker build -t=apachestratos/mysql .
+docker build -t=apachestratos/mysql .
 #sudo docker push apachestratos/mysql

http://git-wip-us.apache.org/repos/asf/stratos/blob/2cec5507/tools/stratos-docker-images/stratos/docker-build.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-docker-images/stratos/docker-build.sh b/tools/stratos-docker-images/stratos/docker-build.sh
index 0c33bba..fc890cc 100755
--- a/tools/stratos-docker-images/stratos/docker-build.sh
+++ b/tools/stratos-docker-images/stratos/docker-build.sh
@@ -28,8 +28,8 @@ wget -N -q -P files/ http://archive.apache.org/dist/activemq/5.9.1/apache-active
 
 wget -N -q -P files/ http://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.29/mysql-connector-java-5.1.29.jar
 
-cp -rf $STRATOS_SOURCE/tools/stratos-installer/ files/
+cp -rf $STRATOS_SOURCE/tools/stratos-installer files/
 
 cp -rf $STRATOS_SOURCE/extensions/ files/
 
-sudo docker build -t=apachestratos/stratos .
+docker build -t=apachestratos/stratos .