Skip to content
Permalink
Browse files

Change Docker definitions

  • Loading branch information...
francisdaigle committed Jan 21, 2016
1 parent ae95307 commit 2cfad28289f1079fbca18c71755a56cea67a912c
Showing with 20 additions and 16 deletions.
  1. +5 −5 Dockerfile
  2. +3 −3 bower.json
  3. +12 −8 docker-compose.yml
@@ -5,23 +5,23 @@ RUN apt-get update -qq && apt-get install -y build-essential
RUN apt-get install -y ruby
RUN gem install sass

WORKDIR /home/mean
WORKDIR /home/pean

# Install Mean.JS Prerequisites
RUN npm install -g grunt-cli
RUN npm install -g bower

# Install Mean.JS packages
ADD package.json /home/mean/package.json
ADD package.json /home/pean/package.json
RUN npm install

# Manually trigger bower. Why doesnt this work via npm install?
ADD .bowerrc /home/mean/.bowerrc
ADD bower.json /home/mean/bower.json
ADD .bowerrc /home/pean/.bowerrc
ADD bower.json /home/pean/bower.json
RUN bower install --config.interactive=false --allow-root

# Make everything available for start
ADD . /home/mean
ADD . /home/pean

# Set development environment as default
ENV NODE_ENV development
@@ -1,7 +1,7 @@
{
"name": "meanjs",
"description": "Fullstack JavaScript with MongoDB, Express, AngularJS, and Node.js.",
"homepage": "http://meanjs.org/",
"name": "peanjs",
"description": "Fullstack JavaScript with PostgreSQL, Express, AngularJS, and Node.js.",
"homepage": "http://peanjs.org/",
"license": "MIT",
"dependencies": {
"bootstrap": "~3",
@@ -1,12 +1,16 @@
db:
image: postgres
ports:
- "5432:5432"
environment:
POSTGRES_USER: test
POSTGRES_PASSWORD: test
web:
build: .
links:
- db
ports:
- "3000:3000"
- db
environment:
NODE_ENV: development
db:
image: mongo
ports:
- "27017:27017"
SEQ_DB: test
SEQ_USER: test
SEQ_PW: test
DATABASE_URL: postgres://username:test@db:5432

0 comments on commit 2cfad28

Please sign in to comment.
You can’t perform that action at this time.