diff --git a/Gemfile b/Gemfile index 96ba88f..8570545 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ source 'https://rubygems.org' gem 'rails', '4.2.6' gem 'sqlite3' gem 'mysql2', '~> 0.3.18' +gem 'pg', '~> 0.18.4' gem 'sass-rails', '~> 5.0' gem 'uglifier', '>= 1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index fcfb5ca..14be0f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,6 +121,7 @@ GEM shellany (~> 0.0) parslet (1.7.1) blankslate (>= 2.0, <= 4.0) + pg (0.18.4) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -235,6 +236,7 @@ DEPENDENCIES jbuilder (~> 2.4) jquery-rails (~> 4.1.0) mysql2 (~> 0.3.18) + pg (~> 0.18.4) rails (= 4.2.6) rspec-rails (~> 3.4.0) sass-rails (~> 5.0) diff --git a/config/database.yml b/config/database.yml index e826bac..b0ef97c 100644 --- a/config/database.yml +++ b/config/database.yml @@ -30,10 +30,10 @@ docker: database: parsley production: - adapter: mysql2 + adapter: pg pool: 5 timeout: 5000 host: <%= ENV['PARSLEY_DB_HOST'] || 'mysql' %> username: <%= ENV['PARSLEY_DB_USER'] || 'parsley_user' %> - password: <%= ENV['PARSLEY_DB_PASSWORD'] || 'parsley_password' %> + password: <%= ENV['PARSLEY_PG_PASSWORD'] || 'parsley_password' %> database: <%= ENV['PARSLEY_DB_NAME'] || 'parsley' %>