Skip to content

Commit

Permalink
Cleanup in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
corradio committed Mar 3, 2017
1 parent 7dd0969 commit 7428570
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 1,107 deletions.
2 changes: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

datascience

feeder/node_modules

web/node_modules
web/build
web/public/dist
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
*.pyc
*.env
mongodata
src
grib2json
feeder/node_modules
web/public/dist
web/node_modules
.ipynb_checkpoints/
Expand Down
22 changes: 0 additions & 22 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,14 @@ services:
context: .
dockerfile: web/Dockerfile
command: npm run server-dev
depends_on: [mongo, memcached]
environment:
- ENV=development
- MEMCACHED_HOST=memcached
- 'MONGO_URL=mongodb://mongo:27017/electricity'
ports: ['8000:8000']
volumes:
- './shared:/home/shared'
- './web/app:/home/web/app'
- './web/package.json:/home/web/package.json'
- './web/public:/home/web/public'
- './web/server.js:/home/web/server.js'
- './web/views:/home/web/views'
- './web/webpack.config.js:/home/web/webpack.config.js'
- './web/locales:/home/web/locales'
feeder:
build:
context: .
dockerfile: feeder/Dockerfile
depends_on: [mongo]
env_file: ./secrets.env
environment:
- ENV=development
- MEMCACHED_HOST=memcached
- 'MONGO_URL=mongodb://mongo:27017/electricity'
volumes:
- './feeder:/home/feeder'
- './shared:/home/shared'
memcached:
image: memcached
mongo:
image: mongo
volumes: ['/data/db']
18 changes: 0 additions & 18 deletions feeder/Dockerfile

This file was deleted.

Loading

0 comments on commit 7428570

Please sign in to comment.