Merge pull request openshift#27 from mfojtik/rename

Renamed runlocal.sh to run.sh
michaelepley · Feb 26, 2015 · 3849de4 · 3849de4
2 parents c3595af + 68b1463
commit 3849de4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/.sti/environment b/.sti/environment
@@ -0,0 +1,2 @@
+# The default environment for this Ruby application is production
+RACK_ENV=production
diff --git a/app.rb b/app.rb
@@ -10,7 +10,7 @@
 
   if ENV['RACK_ENV']=="production"
     while !self.connect_to_database_prod
-      puts "Connecting to production database...\n"
+      puts "Connecting to production database (#{ENV['DATABASE_SERVICE_HOST']})...\n"
       sleep 0.1
     end
   else

diff --git a/run.sh b/run.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Helper script to run the sample app locally, assumes a local mysql instance with a
+# login of root/root
+if [ -z "${MYSQL_DATABASE}" ]; then
+  export DATABASE_SERVICE_HOST=localhost
+  export DATABASE_SERVICE_PORT=3306
+  export MYSQL_DATABASE=test
+  export MYSQL_ROOT_PASSWORD=root
+fi
+
+bundle exec ruby app.rb
diff --git a/runlocal.sh b/runlocal.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# The default environment for this Ruby application is production
		RACK_ENV=production