-
Notifications
You must be signed in to change notification settings - Fork 260
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Docker #435
Merged
Docker #435
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
17e1c4b
add docker configs
mi-wood abe0847
remove vagrant
mi-wood 1b8c5d8
remove more vagrant
mi-wood fe74796
update docs
mi-wood b67dc87
attempt to use travis...
mi-wood 3bf8f02
use compose
mi-wood 52d542e
add docs for forking project
mi-wood 3fa6d25
update contributing docs
mi-wood 3e2fdcf
resolve merge conflicts
mi-wood fc71ccf
add db:create and db:migrate as entrypoint
mi-wood c88d650
update docs
mi-wood 613f226
Merge branch 'develop' into docker
mi-wood File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,6 @@ | ||
language: ruby | ||
cache: bundler | ||
services: docker | ||
before_install: | ||
- docker-compose build | ||
script: | ||
- bundle exec rake db:setup RAILS_ENV=test | ||
- bundle exec rake db:test:prepare | ||
- bundle exec rake spec | ||
- bundle exec rake cucumber | ||
rvm: | ||
- 2.3.1 | ||
- docker-compose run -e "RAILS_ENV=test" web rake db:test:prepare spec cucumber |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
FROM ruby:2.3.1 | ||
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs | ||
ENV PHANTOM_JS=2.1.1 | ||
RUN apt-get update && \ | ||
apt-get install build-essential chrpath libssl-dev libxft-dev -y && \ | ||
apt-get install libfreetype6 libfreetype6-dev -y && \ | ||
apt-get install libfontconfig1 libfontconfig1-dev -y && \ | ||
cd ~ && \ | ||
export PHANTOM_JS="phantomjs-2.1.1-linux-x86_64" && \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. just reminding myself this should be $PANTOM_JS not 2.1.1 |
||
wget https://github.com/Medium/phantomjs/releases/download/v2.1.1/$PHANTOM_JS.tar.bz2 && \ | ||
tar xvjf $PHANTOM_JS.tar.bz2 && \ | ||
mv $PHANTOM_JS /usr/local/share && \ | ||
ln -sf /usr/local/share/$PHANTOM_JS/bin/phantomjs /usr/local/bin | ||
RUN mkdir /refugerestrooms | ||
WORKDIR /refugerestrooms | ||
COPY Gemfile /refugerestrooms/Gemfile | ||
COPY Gemfile.lock /refugerestrooms/Gemfile.lock | ||
RUN bundle install | ||
COPY . /refugerestrooms |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,17 @@ | ||
development: | ||
default: &default | ||
adapter: postgresql | ||
encoding: unicode | ||
database: bathrooms_development | ||
host: db | ||
username: postgres | ||
password: | ||
pool: 5 | ||
host: localhost | ||
|
||
development: | ||
<<: *default | ||
database: bathrooms_development | ||
|
||
|
||
test: | ||
adapter: postgresql | ||
encoding: unicode | ||
<<: *default | ||
database: bathrooms_test | ||
pool: 5 | ||
host: localhost | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
version: '3' | ||
services: | ||
db: | ||
image: postgres | ||
web: | ||
build: . | ||
entrypoint: [setup/entry] | ||
command: bundle exec rails s -p 3000 -b '0.0.0.0' | ||
volumes: | ||
- .:/refugerestrooms | ||
ports: | ||
- "3000:3000" | ||
depends_on: | ||
- db |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#!/bin/bash | ||
set -e | ||
|
||
rake db:create | ||
rake db:migrate | ||
|
||
exec "$@" |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tkwidmer do we need this anymore? I feel if we do, it might not belong in this doc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if we still need this. The seed has been reduced to a small sample set rather than a larger set that it used to be. So we may not need this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm going to delete since in my past 3.5 years of working on this I've never done this. It might just be confusing to a newcomer