Skip to content
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.

Sign up for GitHub

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

Add docker as a platform option #3

Merged
merged 31 commits into from
Mar 12, 2016
Merged

Add docker as a platform option #3

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
fc38d04
CONFIG: Allow extended populate to be run without prompting user
alexcu Mar 6, 2016
13620a7
CONFIG: Add docker database connection to config file
alexcu Mar 6, 2016
63f63ea
CONFIG: Add dockerfile
alexcu Mar 6, 2016
47d02a9
CONFIG: Add docker compose file
alexcu Mar 6, 2016
c6e8ae9
DOCS: Add Docker setup to README
alexcu Mar 6, 2016
d5ad9a6
DOCS: Fix formatting in README
alexcu Mar 6, 2016
c676ad2
CONFIG: Remove texlive from container dependencies installation
alexcu Mar 6, 2016
243ac9c
FIX: Expose postgres port for database container
alexcu Mar 6, 2016
0b0dff8
FIX: Remove ci/reporter/rake/rspec from Rakefile
alexcu Mar 6, 2016
cb04e40
FIX: Ensure backports is only updated
alexcu Mar 7, 2016
142ff28
FIX: Remove populate command from Dockerfile
alexcu Mar 7, 2016
6562b7c
CONFIG: Update docker compose format to version 2
alexcu Mar 7, 2016
35e6447
DOCS: Update docker compose commands in README to inclue -p switch
alexcu Mar 7, 2016
c5e1acd
CONFIG: Add optional start to ruby 2.1.2
alexcu Mar 11, 2016
6297462
CONFIG: Remove docker as an config environment for database.yml
alexcu Mar 11, 2016
5ec61b5
CONFIG: Remove the RAILS_ENV docker envvar and cache gems locally
alexcu Mar 11, 2016
146c44b
CONFIG: Map doubtfire to localhost instead of docker-machine ip
alexcu Mar 11, 2016
3ab8680
CONFIG: Remove env printout and caching of gems in Dockerfile
alexcu Mar 11, 2016
e1847a8
FIX: Add missing task argument to task script
alexcu Mar 11, 2016
fc33a0f
CONFIG: Update ports to map to 0.0.0.0 instead of localhost
alexcu Mar 11, 2016
bb95a0b
CONFIG: Kill all previous instances of rails server on launch
alexcu Mar 11, 2016
212e71d
CONFIG: Code in correct database connection string
alexcu Mar 11, 2016
1627e1d
NEW: Add new start and stop scripts to start/stop DF via Docker
alexcu Mar 11, 2016
0c2c522
FIX: Ensure the server pid is only removed if it exists
alexcu Mar 11, 2016
fc1ba1f
ENHANCE: Improvements to handling errors and more logging
alexcu Mar 11, 2016
4223613
DOCS: Update readme with new scripts
alexcu Mar 11, 2016
32c0e63
ENHANCE: Attempt to start docker machine if not running
alexcu Mar 11, 2016
c3a6605
ENHANCE: Replace separate start/stop scripts with one script
alexcu Mar 12, 2016
d1199f7
ENHANCE: Add livereload port for web to config
alexcu Mar 12, 2016
8a52d4f
ENHANCE: Add attaching/detaching from containers
alexcu Mar 12, 2016
dc98f0f
DOCS: Add details about attaching to containers using docker.sh
alexcu Mar 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CONFIG: Update ports to map to 0.0.0.0 instead of localhost
  • Loading branch information
@alexcu
alexcu committed Mar 11, 2016
commit fc33a0f4670e3f8bf8a9bc8acdbf39b4b4767210
8 changes: 5 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
build: .
command: rails s
ports:
- "127.0.0.1:3000:3000"
- "3000:3000"
volumes:
- ../doubtfire-api:/doubtfire-api
links:
Expand All @@ -21,14 +21,16 @@ services:
ports:
- "5432:5432"
environment:
POSTGRES_PASSWORD: 'd872$dh'
POSTGRES_PASSWORD: d872$$dh
POSTGRES_USER: itig

web:
container_name: doubtfire-web
build: ../doubtfire-web
command: grunt watchsvr
environment:
DOUBTFIRE_DOCKER_MACHINE_IP: $DOUBTFIRE_DOCKER_MACHINE_IP
ports:
- "127.0.0.1:8000:8000"
- "8000:8000"
volumes:
- ../doubtfire-web:/doubtfire-web