Skip to content

Commit a09f6a1

Browse files
author
Aaron Judd
committed
Merge pull request #169 from ongoworks/v0.1.6
V0.1.6
2 parents 7506827 + d50d06c commit a09f6a1

File tree

9 files changed

+124
-397
lines changed

9 files changed

+124
-397
lines changed

.meteor/.finished-upgraders

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
# with your project.
44

55
notices-for-0.9.0
6+
notices-for-0.9.1

.meteor/cordova-plugins

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

.meteor/packages

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ coffeescript
1010
jquery
1111
force-ssl
1212
oauth-encryption
13+
accounts-facebook
1314

1415
# Reaction Commerce Packages
1516
reactioncommerce:core
1617
reactioncommerce:reaction-paypal
1718
reactioncommerce:reaction-google-analytics
1819
reactioncommerce:reaction-helloworld
19-
accounts-facebook
20+

.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1+

.meteor/versions

Lines changed: 84 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,115 @@
1-
accounts-base@1.0.0
1+
accounts-base@1.1.0
22
3-
accounts-oauth@1.0.0
4-
5-
accounts-ui-unstyled@1.0.0
6-
alanning:[email protected].12
7-
aldeed:autoform@1.0.0
8-
aldeed:collection2@1.0.0
3+
accounts-oauth@1.1.0
4+
5+
accounts-ui-unstyled@1.1.1
6+
alanning:[email protected].13
7+
aldeed:autoform@2.0.2
8+
aldeed:collection2@2.1.0
99
10-
11-
aldeed:template-extension@0.1.0
10+
11+
aldeed:template-extension@2.0.0
1212
13-
14-
13+
14+
15+
1516
1617
17-
18+
19+
1820
19-
20-
21-
22-
23-
24-
25-
26-
27-
28-
29-
30-
31-
21+
22+
23+
24+
25+
26+
27+
28+
29+
30+
31+
32+
33+
34+
35+
36+
37+
38+
39+
40+
3241
33-
34-
35-
36-
37-
42+
43+
44+
45+
3846
39-
data-man@0.0.0
40-
41-
42-
47+
dburles:collection-helpers@1.0.0
48+
49+
50+
4351
44-
45-
facebook@1.0.0
46-
47-
52+
53+
fastclick@1.0.0
54+
55+
4856
4957
5058
51-
52-
53-
54-
59+
60+
5561
56-
57-
iron:dynamic-template@0.3.0
58-
iron:layout@0.3.0
59-
62+
63+
iron:dynamic-template@0.4.1
64+
iron:layout@0.4.1
65+
6066
6167
62-
63-
68+
69+
6470
65-
66-
67-
68-
69-
70-
71+
72+
73+
74+
75+
76+
77+
78+
79+
7180
7281
7382
7483
7584
76-
oauth2@1.0.0
77-
oauth@1.0.0
78-
85+
oauth2@1.1.0
86+
oauth@1.1.0
87+
7988
80-
power-queue@0.0.0
89+
raix:eventemitter@0.0.1
8190
8291
83-
reactioncommerce:[email protected].5
92+
reactioncommerce:[email protected].6
8493
reactioncommerce:[email protected]
85-
reactioncommerce:[email protected].2
94+
reactioncommerce:[email protected].3
8695
reactioncommerce:[email protected]
87-
88-
89-
90-
96+
97+
98+
9199
92-
100+
93101
94-
95-
102+
103+
96104
97-
98-
105+
106+
99107
100-
101-
102-
ui-dropped-event@0.0.7
103-
108+
109+
110+
tracker@1.0.2
111+
104112
105-
113+
114+
115+

Dockerfile

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,59 @@
11
############################################################
2-
# Dockerfile the demeteorizers a Meteor app, and runs
3-
# as a standard node app.
2+
# Builds a Meteor 0.9.x+ application Docker image
3+
#
44
# See: http://docs.docker.io/
5+
#
6+
# Important: Best to run from a clean directory that hasn't had meteor run in it.
7+
# Important: packages/<pkg>/.npm and .build* should not exist
8+
#
59
# Example usage:
6-
# cd appdir
7-
# docker build --tag="ongoworks/reaction:0.1.0" . #build step
8-
# docker push ongoworks/reaction:0.1.0 #push to docker repo
9-
# docker run -p 127.0.0.1:8080:8080 ongoworks/reaction:0.1.0 #run
10-
############################################################
10+
# cd appdir #in app dir
11+
# docker build --tag="<org>/<app>" . #build step
12+
# docker push <org>/<app> #push to docker repo
13+
# docker run -p 127.0.0.1:8080:8080 <org>/<app> #run
14+
##############################################################
1115

12-
FROM node
16+
FROM google/debian:wheezy
1317
MAINTAINER Aaron Judd <[email protected]>
1418

15-
#Install required packages first
16-
RUN apt-get update && apt-get install -qq -y curl git gcc make build-essential imagemagick
19+
# install node + (optional imagemagick for cfs:graphicsmagick)
20+
RUN apt-get update -y && apt-get install --no-install-recommends -y -q curl python gcc make build-essential git ca-certificates nano
21+
RUN mkdir /nodejs && curl http://nodejs.org/dist/v0.10.29/node-v0.10.29-linux-x64.tar.gz | tar xvzf - -C /nodejs --strip-components=1
22+
ENV PATH $PATH:/nodejs/bin
23+
24+
# install imagemagick (optional for cfs:graphicsmagick)
25+
RUN apt-get install --no-install-recommends -y -q chrpath libfreetype6 libfreetype6-dev libssl-dev libfontconfig1 imagemagick
1726

18-
# Update to latest node
19-
RUN npm cache clean -f && npm install -g n && n 0.10.29
27+
#install forever and phantomjs (optional for spiderable)
28+
RUN npm install --silent -g forever phantomjs
2029

2130
# Install Meteor
2231
RUN curl https://install.meteor.com | /bin/sh
23-
RUN npm install --silent -g forever meteorite phantomjs
24-
25-
# Add current dir+subs to meteorsrc
26-
ADD . ./meteorsrc
27-
WORKDIR /meteorsrc
32+
ADD . /meteor/src
33+
WORKDIR /meteor/src/
2834

2935
# Bundle meteorsrc to /var/www/app
30-
RUN mrt install && meteor bundle --directory /var/www/app
31-
32-
# Set the working directory to be used for commands that are run, including the default CMD below
33-
RUN cd /var/www/app/programs/server && npm install
34-
WORKDIR /var/www/app
36+
RUN meteor build --directory /meteor
37+
RUN cd /meteor/bundle/programs/server/ && npm install
38+
WORKDIR /meteor/bundle
3539

3640
#
37-
# Default ENV settings for meteor app
38-
# Required to run meteor!
41+
# Default Meteor ENV settings for meteor app
3942
# either change these or pass as --env in the docker run
4043
#
4144
ENV PORT 8080
4245
ENV ROOT_URL "http://127.0.0.1"
4346
ENV MONGO_URL "mongodb://127.0.0.1:3001/meteor"
44-
47+
ENV DISABLE_WEBSOCKETS "1"
4548

4649
# Expose container port 8080 to the host (outside the container)
4750
EXPOSE 8080
4851

4952
RUN touch .foreverignore
53+
5054
# Define default command that runs the node app on container port 8080
51-
CMD forever -w ./main.js
55+
CMD forever -w ./main.js
56+
57+
58+
# Clean up APT when done.
59+
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /meteor/src

packages/.gitignore

Lines changed: 1 addition & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,5 @@
1-
/spin
2-
/highcharts
3-
/roles
4-
/x-editable-bootstrap3
5-
/iron-router
6-
/videojs
7-
/parsleyjs
8-
/font-awesome-4
9-
/bootstrap3-less
10-
font-awesome-4
11-
bootstrap3-less
12-
spin
13-
highcharts
14-
roles
15-
x-editable-bootstrap3
16-
iron-router
17-
parsleyjs
18-
autoform
19-
simple-schema
20-
moment
21-
collection2
22-
/accounts-ui-bootstrap-3
23-
accounts-ui-bootstrap-3
24-
collection-hooks
25-
collection-behaviours
26-
underscore-string-latest
27-
handlebars-server
28-
/headers
29-
headers
30-
/paypal
31-
/npm
32-
/paypal
33-
/jqueryui
34-
/build-fetcher
35-
/font-awesome-4-less
36-
/phantomjs
37-
/collectionFS
38-
/cfs-public-folder
39-
/simple-schema
40-
/handlebars-server
41-
/autoform
42-
/bootstrap-alerts
43-
/collection-hooks
44-
/blaze-layout
45-
/cfs-filesystem
46-
/cfs-base-package
47-
/cfs-transfer
48-
/cfs-file
49-
/cfs-ejson-file
50-
/cfs-collection
51-
/cfs-access-point
52-
/cfs-worker
53-
/cfs-upload-http
54-
/cfs-storage-adapter
55-
/power-queue
56-
/reactive-list
57-
/cfs-filesaver
58-
/cfs-upload-ddp
59-
/http-methods
60-
/http-publish
61-
/cfs-gridfs
62-
/cfs-tempstore
63-
/reactive-property
64-
/micro-queue
65-
/cfs-handlebars
66-
/jquery-cookie
67-
/collection2
68-
/cfs-s3
69-
/ui-dropped-event
70-
/data-man
71-
/cfs-graphicsmagick
72-
/cfs-collection-filters
73-
/fast-render
74-
/numeral
75-
/moment
76-
/reaction-app-packages
771
/reaction-core
782
/reaction-paypal
793
/reaction-google-analytics
804
/reaction-helloworld
81-
/underscore-string-latest
82-
/emitter
83-
/kadira
84-
/iron-layout
85-
/iron-core
86-
/iron-dynamic-template
87-
/geocoder
88-
/collection-helpers
89-
/reaction-search
90-
/template-extension
91-
/collectionfs
5+
/roles

0 commit comments

Comments
 (0)