Merge pull request openshift#18 from bparees/enable_sti

enable hello world app for STI building
cthiel1 · Nov 2, 2014 · 19b0cff · 19b0cff
2 parents 84fc19f + f2221f4
commit 19b0cff
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 19 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM openshift/ruby-20-centos
 
 RUN gem install sinatra sinatra-activerecord mysql2 --no-ri --no-rdoc
 
-ADD sinatra_app /tmp/
+ADD . /tmp/
 
 USER root
 
@@ -13,4 +13,4 @@ USER ruby
 WORKDIR /tmp/
 
 EXPOSE 8080
-CMD ["ruby", "start.rb"]
+CMD ["ruby", "app.rb"]
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'sinatra'
+gem 'sinatra-activerecord'
+gem 'mysql2'
+gem 'rake'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,46 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.1.7)
+      activesupport (= 4.1.7)
+      builder (~> 3.1)
+    activerecord (4.1.7)
+      activemodel (= 4.1.7)
+      activesupport (= 4.1.7)
+      arel (~> 5.0.0)
+    activesupport (4.1.7)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    i18n (0.6.11)
+    json (1.8.1)
+    minitest (5.4.2)
+    mysql2 (0.3.16)
+    rack (1.5.2)
+    rack-protection (1.5.3)
+      rack
+    rake (10.3.2)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sinatra-activerecord (2.0.3)
+      activerecord (>= 3.2)
+      sinatra (~> 1.0)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mysql2
+  rake
+  sinatra
+  sinatra-activerecord
diff --git a/Rakefile b/Rakefile
@@ -0,0 +1,4 @@
+require_relative 'config/environments'
+require_relative 'models'
+require 'sinatra/activerecord/rake'
+
diff --git a/sinatra_app/app.rb → app.rb b/sinatra_app/app.rb → app.rb
@@ -5,6 +5,21 @@
 set :bind, '0.0.0.0'
 set :port, 8080
 
+configure do
+  puts "Running app file"
+  puts "Create database..."
+  %x"rake db:create"
+  puts "Run migrations..."
+  %x"rake db:migrate"
+  puts "Run app..."
+
+  while !self.connect_to_database
+    puts "Connecting to database...\n"
+    sleep 0.1
+  end
+  puts "Connected to database"
+end
+
 get '/' do
   Timestamp.create(date: Time.now, text: "This is a message from a database query. The last insertion in the database was at")
   "Hello World!\n"+

diff --git a/config.ru b/config.ru
@@ -0,0 +1,2 @@
+require './app'
+run Sinatra::Application
diff --git a/sinatra_app/config/database.yml → config/database.yml b/sinatra_app/config/database.yml → config/database.yml
diff --git a/sinatra_app/config/environments.rb → config/environments.rb b/sinatra_app/config/environments.rb → config/environments.rb
@@ -16,12 +16,3 @@ def self.connect_to_database
     return false
   end
 end
-
-configure :development do
-
-  while !self.connect_to_database
-    puts "Connecting to database...\n"
-    sleep 0.1
-  end
-  puts "Connected to database"
-end
diff --git a/...db/migrate/1414364400_create_timestamp.rb → db/migrate/1414364400_create_timestamp.rb b/...db/migrate/1414364400_create_timestamp.rb → db/migrate/1414364400_create_timestamp.rb
diff --git a/sinatra_app/models.rb → models.rb b/sinatra_app/models.rb → models.rb
diff --git a/sinatra_app/Rakefile b/sinatra_app/Rakefile
diff --git a/sinatra_app/start.rb b/sinatra_app/start.rb