Skip to content

Commit

Permalink
Fix #1 add docker-compose
Browse files Browse the repository at this point in the history
  • Loading branch information
dimus committed Aug 8, 2017
1 parent e89c8cd commit df6cbbc
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 43 deletions.
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.1.6
1 change: 0 additions & 1 deletion .rvmrc

This file was deleted.

4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ gem 'addressable'
group :test, :development do
gem 'rake'
gem 'rspec'
gem 'debugger'
gem 'perftools.rb'
gem 'rdp-ruby-prof'
gem 'byebug'
end


18 changes: 5 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,16 @@ GEM
addressable (2.3.2)
arel (3.0.2)
builder (3.0.0)
columnize (0.3.6)
byebug (9.0.6)
composite_primary_keys (5.0.6)
activerecord (~> 3.2.0)
debugger (1.2.0)
columnize (>= 0.3.1)
debugger-linecache (~> 1.1.1)
debugger-ruby_core_source (~> 1.1.3)
debugger-linecache (1.1.2)
debugger-ruby_core_source (>= 1.1.1)
debugger-ruby_core_source (1.1.3)
diff-lcs (1.1.3)
i18n (0.6.0)
mime-types (1.18)
multi_json (1.3.5)
mysql2 (0.3.11)
perftools.rb (2.0.0)
posix-spawn (0.3.6)
rake (0.9.2.2)
rdp-ruby-prof (0.7.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.10.0)
Expand All @@ -53,13 +44,14 @@ PLATFORMS
DEPENDENCIES
activerecord (~> 3.2.3)
addressable
byebug
composite_primary_keys (>= 4.0.0)
debugger
mysql2
perftools.rb
posix-spawn
rake
rdp-ruby-prof
rest-client
rspec
unicode_utils

BUNDLED WITH
1.15.3
26 changes: 0 additions & 26 deletions config.yml.example

This file was deleted.

6 changes: 6 additions & 0 deletions config/env.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
RACKAPP_DB_HOST=db
RACKAPP_DB_PASSWORD=""
RACKAPP_DB_USERNAME=postgres
RACKAPP_SERVER=0.0.0.0:9292
RACKAPP_SESSION_SECRET=changeme
RACK_ENV=development
31 changes: 31 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: "2"
services:
app:
build: .
volumes:
- .:/app
ports:
- "0.0.0.0:9292:9292"
env_file:
- "config/env.sh"
links:
- db
- webpack
db:
image: postgres:9.6
ports:
- "0.0.0.0:15432:5432"
volumes:
- pg:/var/lib/postgres/data
webpack:
build: .
env_file:
- "config/env.sh"
command: bash -c "npm run refresh && npm run start -- --host=0.0.0.0 --port=8080"
volumes:
- .:/app
ports:
- '8080:8080'
volumes:
pg:
external: false
Empty file added exe/start.sh
Empty file.

0 comments on commit df6cbbc

Please sign in to comment.