docker conversion to postgresql

This commit is contained in:
Dan Elbert 2016-07-08 11:17:42 -05:00
parent 4137c9fd7c
commit b8e0835741
5 changed files with 23 additions and 24 deletions

View File

@ -1,7 +1,7 @@
FROM phusion/passenger-ruby22:latest
RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get upgrade -y --force-yes \
&& apt-get install -y ruby2.3 ruby2.3-dev \
&& ruby-switch --set ruby2.3

View File

@ -2,7 +2,6 @@ source 'https://rubygems.org'
gem 'rails', '5.0.0'
gem 'sqlite3'
gem 'mysql2', '~> 0.3.18'
gem 'pg', '~> 0.18.4'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'

View File

@ -107,7 +107,6 @@ GEM
mini_portile2 (2.1.0)
minitest (5.9.0)
multi_json (1.12.1)
mysql2 (0.3.21)
nenv (0.3.0)
nio4r (1.2.1)
nokogiri (1.6.8)
@ -236,7 +235,6 @@ DEPENDENCIES
guard-rspec
jbuilder (~> 2.5)
jquery-rails (~> 4.1.1)
mysql2 (~> 0.3.18)
pg (~> 0.18.4)
rails (= 5.0.0)
rspec-rails (~> 3.5.0)
@ -249,4 +247,4 @@ DEPENDENCIES
web-console (~> 3.3.1)
BUNDLED WITH
1.11.2
1.12.5

View File

@ -21,12 +21,12 @@ test:
database: db/test.sqlite3
docker:
adapter: mysql2
adapter: postgresql
pool: 5
timeout: 5000
host: mysql
host: postgres
username: parsley
password: password
password: mysecretpassword
database: parsley
production:

View File

@ -1,17 +1,19 @@
mysql:
image: mysql:5.6
version: '2'
services:
postgres:
image: postgres:9.3
environment:
- MYSQL_ROOT_PASSWORD=mysupersecret
- MYSQL_DATABASE=parsley
- MYSQL_USER=parsley
- MYSQL_PASSWORD=password
volumes_from:
- parsley_db_data
web:
- POSTGRES_PASSWORD=mysecretpassword
- POSTGRES_USER=parsley
volumes:
- sql-data:/var/lib/postgresql/data
web:
build: .
ports:
- "3000:80"
links:
- mysql
- postgres
volumes:
sql-data:
driver: local