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.

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 compose for developer env #95958132 #1

Merged
merged 1 commit into from
Jun 9, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .bowerrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"directory": "mtp_cashbook/apps/core/assets-src/app/bower_components"
"directory": "mtp_cashbook/assets-src/bower_components"
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ venv/
# Node Stuff
node_modules

assets-src/bower
mtp_cashbook/assets-src/bower_components

8 changes: 4 additions & 4 deletions fig.yml → docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
django:
build: .
command: python manage.py runserver 0.0.0.0:8001
volumes:
volumes:
- .:/app
ports:
- "8001:8001"

djangogulpserve:
build: .
command: /bin/bash -c "gulp serve --host=$DJANGO_1_PORT_8000_TCP_ADDR --port=$TESTMOJDJANGO_DJANGO_1_PORT_8000_TCP_PORT"
volumes:
command: /bin/bash -c "gulp serve --host=$DJANGO_1_PORT_8001_TCP_ADDR --port=$TESTMOJDJANGO_DJANGO_1_PORT_8001_TCP_PORT"
volumes:
- .:/app
ports:
- "3000:3000"
links:
- django
- django
5 changes: 4 additions & 1 deletion mtp_cashbook/assets-src/stylesheets/app.scss
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
// Your sass styles go here
// Your sass styles go here
body {
background-color: #fa9491;
}
2 changes: 1 addition & 1 deletion tasks/serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var argv = require('yargs').argv;
// Proxy existing server via brower-sync and serve on localhost:3000
gulp.task('serve', ['build'], function() {
var host = argv.host || argv.h || 'localhost';
var port = argv.port || argv.p || 8000;
var port = argv.port || argv.p || 8001;

browserSync({
proxy: host + ':' + port,
Expand Down