Skip to content

Commit 630abc2

Browse files
author
Aaron Judd
committed
Merge pull request #131 from ongoworks/devel
Updated Dockerfile that user Meteor bundle
2 parents ff2ab24 + add5605 commit 630abc2

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

Dockerfile

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,24 @@
99
# docker run -p 127.0.0.1:8080:8080 ongoworks/reaction:0.1.0 #run
1010
############################################################
1111

12-
FROM cmfatih/nodejs
12+
FROM node
1313
MAINTAINER Aaron Judd <[email protected]>
1414

1515
#Install required packages first
16-
RUN apt-get install -qq -y curl git gcc make build-essential
16+
RUN apt-get install -qq -y curl git
1717
RUN curl https://install.meteor.com | /bin/sh
18-
RUN npm install --silent -g forever demeteorizer meteorite
18+
RUN npm install --silent -g forever meteorite
1919

2020
# Add current dir+subs to meteorsrc
2121
ADD . ./meteorsrc
2222
WORKDIR /meteorsrc
2323

24-
# Demeteorize meteorsrc to /var/www/app
25-
RUN mkdir -p /var/www/app && demeteorizer -n v0.10.26 -o /var/www/app
24+
# Bundle meteorsrc to /var/www/app
25+
RUN mrt install && meteor bundle --directory /var/www/app
2626

2727
# Set the working directory to be used for commands that are run, including the default CMD below
2828
WORKDIR /var/www/app
29-
30-
RUN rm -rf /usr/local/meteor /usr/local/bin/meteor ~/.meteor
31-
RUN cd /var/www/app/ && npm uninstall --silent fibers && npm update
29+
RUN rm -r programs/server/node_modules/fibers && npm install [email protected]
3230

3331
#
3432
# Default ENV settings for meteor app
@@ -38,12 +36,11 @@ RUN cd /var/www/app/ && npm uninstall --silent fibers && npm update
3836
ENV PORT 8080
3937
ENV ROOT_URL "http://127.0.0.1"
4038
ENV MONGO_URL "mongodb://127.0.0.1:3001/meteor"
41-
#ENV MAIL_URL "smtp://user:password@mailhost:port/"
39+
4240

4341
# Expose container port 8080 to the host (outside the container)
4442
EXPOSE 8080
4543

46-
WORKDIR /var/www/app
4744
RUN touch .foreverignore
4845
# Define default command that runs the node app on container port 8080
4946
CMD forever -w ./main.js

smart.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
"git": "https://github.com/ongoworks/reaction-core.git"
2323
},
2424
"reaction-paypal": {
25-
"git": "https://github.com/ongoworks/reaction-paypal.git",
26-
"tag": "v0.1.0"
25+
"git": "https://github.com/ongoworks/reaction-paypal.git"
2726
},
2827
"reaction-google-analytics": {
2928
"git": "https://github.com/ongoworks/reaction-google-analytics.git",

0 commit comments

Comments
 (0)