Meteor 0.9.2.2 + Reaction 0.1.6

aaronjudd · aaronjudd · commit d50d06c720a3 · 2014-09-24T18:07:56.000-07:00
diff --git a/.meteor/cordova-plugins b/.meteor/cordova-plugins
@@ -0,0 +1 @@
+
diff --git a/.meteor/packages b/.meteor/packages
@@ -10,10 +10,11 @@ coffeescript
 jquery
 force-ssl
 oauth-encryption
+accounts-facebook
 
 # Reaction Commerce Packages
 reactioncommerce:core
 reactioncommerce:reaction-paypal
 reactioncommerce:reaction-google-analytics
 reactioncommerce:reaction-helloworld
-accounts-facebook
+
diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-METEOR@0.9.1
+METEOR@0.9.2.2
diff --git a/.meteor/versions b/.meteor/versions
@@ -1,97 +1,103 @@
-accounts-base@1.0.1
+accounts-base@1.1.0
 accounts-facebook@1.0.0
-accounts-oauth@1.0.0
+accounts-oauth@1.1.0
 accounts-password@1.0.1
-accounts-ui-unstyled@1.0.1
-alanning:roles@1.2.12
-aldeed:autoform@1.0.0
-aldeed:collection2@1.0.0
+accounts-ui-unstyled@1.1.1
+alanning:roles@1.2.13
+aldeed:autoform@2.0.2
+aldeed:collection2@2.1.0
 aldeed:geocoder@0.3.1
-aldeed:simple-schema@1.0.1
-aldeed:template-extension@1.0.0
+aldeed:simple-schema@1.0.3
+aldeed:template-extension@2.0.0
 amplify@1.0.0
-application-configuration@1.0.1
-autoupdate@1.0.6
+application-configuration@1.0.2
+autoupdate@1.1.0
+base64@1.0.0
 binary-heap@1.0.0
 blaze-tools@1.0.0
 blaze@2.0.0
+boilerplate-generator@1.0.0
 callback-hook@1.0.0
 cfs:access-point@0.0.0
 cfs:base-package@0.0.0
 cfs:collection-filters@0.0.0
 cfs:collection@0.0.0
 cfs:data-man@0.0.0
 cfs:file@0.0.0
-cfs:graphicsmagick@0.0.0
+cfs:filesystem@0.0.0
+cfs:graphicsmagick@0.0.1
 cfs:gridfs@0.0.0
 cfs:http-methods@0.0.24
 cfs:http-publish@0.0.0
-cfs:power-queue@0.0.0
+cfs:power-queue@0.0.1
 cfs:reactive-list@0.0.0
 cfs:reactive-property@0.0.0
-cfs:standard-packages@0.0.0
+cfs:s3@0.0.0
+cfs:standard-packages@0.0.2
 cfs:storage-adapter@0.0.0
-cfs:tempstore@0.0.0
-cfs:upload-http@0.0.0
+cfs:tempstore@0.0.2
+cfs:upload-http@0.0.2
 cfs:worker@0.0.0
 check@1.0.0
-cmather:handlebars-server@0.2.0
-coffeescript@1.0.2
+cmather:handlebars-server@2.0.0
+coffeescript@1.0.3
 ctl-helper@1.0.3
 ctl@1.0.1
 d3@1.0.0
-dburles:collection-helpers@0.3.2
+dburles:collection-helpers@1.0.0
 ddp@1.0.8
-deps@1.0.2
-ejson@1.0.1
+deps@1.0.3
+ejson@1.0.2
 email@1.0.2
-facebook@1.0.1
+facebook@1.1.0
+fastclick@1.0.0
 follower-livedata@1.0.1
 force-ssl@1.0.1
 geojson-utils@1.0.0
 handlebars@1.0.0
 html-tools@1.0.0
-htmljs@1.0.0
-http@1.0.4
+htmljs@1.0.1
+http@1.0.5
 id-map@1.0.0
 iron:core@0.3.4
 iron:dynamic-template@0.4.1
 iron:layout@0.4.1
 iron:router@0.9.3
 jquery@1.0.0
 json@1.0.0
-less@1.0.7
-livedata@1.0.8
+less@1.0.8
+livedata@1.0.9
 localstorage@1.0.0
-logging@1.0.2
-matb33:collection-hooks@0.7.3
-meteor-platform@1.0.1
-meteor@1.0.3
-minifiers@1.0.2
-minimongo@1.0.2
+logging@1.0.3
+matb33:collection-hooks@0.7.6
+meteor-platform@1.1.0
+meteor@1.1.0
+minifiers@1.1.0
+minimongo@1.0.3
+mobile-status-bar@1.0.0
 mongo-livedata@1.0.4
-mongo@1.0.4
+mongo@1.0.5
 mrt:moment@2.8.1
 mrt:underscore-string-latest@2.3.3
 npm-bcrypt@0.7.7
 npm-node-aes-gcm@0.1.3
 oauth-encryption@1.0.0
-oauth2@1.0.0
-oauth@1.0.1
+oauth2@1.1.0
+oauth@1.1.0
 observe-sequence@1.0.2
 ordered-dict@1.0.0
 raix:eventemitter@0.0.1
 raix:ui-dropped-event@0.0.7
 random@1.0.0
-reactioncommerce:core@0.1.5
+reactioncommerce:core@0.1.6
 reactioncommerce:reaction-google-analytics@0.1.1
-reactioncommerce:reaction-helloworld@0.1.2
+reactioncommerce:reaction-helloworld@0.1.3
 reactioncommerce:reaction-paypal@0.1.2
-reactive-dict@1.0.1
+reactive-dict@1.0.2
 reactive-var@1.0.1
-reload@1.0.1
+reload@1.1.0
 retry@1.0.0
-routepolicy@1.0.0
+routepolicy@1.0.1
 sacha:spin@2.0.4
 service-configuration@1.0.1
 session@1.0.1
@@ -100,8 +106,10 @@ spacebars-compiler@1.0.2
 spacebars@1.0.1
 srp@1.0.0
 standard-app-packages@1.0.1
-templating@1.0.5
+templating@1.0.6
 tracker@1.0.2
-ui@1.0.1
+ui@1.0.2
 underscore@1.0.0
-webapp@1.0.3
+url@1.0.0
+webapp-hashing@1.0.0
+webapp@1.1.1
diff --git a/Dockerfile b/Dockerfile
@@ -1,51 +1,59 @@
 ############################################################
-# Dockerfile the demeteorizers a Meteor app, and runs
-# as a standard node app.
+# Builds a Meteor 0.9.x+ application Docker image
+#
 # See: http://docs.docker.io/
+#
+#  Important:  Best to run from a clean directory that hasn't had meteor run in it.
+#  Important:  packages/<pkg>/.npm and .build* should not exist
+#
 # Example usage:
-# cd appdir
-# docker build --tag="ongoworks/reaction:0.1.0" .   #build step
-# docker push ongoworks/reaction:0.1.0  #push to docker repo
-# docker run -p 127.0.0.1:8080:8080 ongoworks/reaction:0.1.0  #run
-############################################################
+#  cd appdir                                                 #in app dir
+#  docker build --tag="<org>/<app>" .                        #build step
+#  docker push <org>/<app>                                   #push to docker repo
+#  docker run -p 127.0.0.1:8080:8080 <org>/<app>             #run
+##############################################################
 
-FROM node
+FROM google/debian:wheezy
 MAINTAINER Aaron Judd <aaron@ongoworks.com>
 
-#Install required packages first
-RUN apt-get update && apt-get install -qq -y curl git gcc make build-essential imagemagick
+# install node + (optional imagemagick for cfs:graphicsmagick)
+RUN apt-get update -y && apt-get install --no-install-recommends -y -q curl python gcc make build-essential git ca-certificates nano
+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
+ENV PATH $PATH:/nodejs/bin
+
+# install imagemagick (optional for cfs:graphicsmagick)
+RUN apt-get install --no-install-recommends -y -q chrpath libfreetype6 libfreetype6-dev libssl-dev libfontconfig1 imagemagick
 
-# Update to latest node
-RUN npm cache clean -f && npm install -g n && n 0.10.29
+#install forever and phantomjs (optional for spiderable)
+RUN npm install --silent -g forever phantomjs
 
 # Install Meteor
 RUN curl https://install.meteor.com | /bin/sh
-RUN npm install --silent -g forever meteorite phantomjs
-
-# Add current dir+subs to meteorsrc
-ADD . ./meteorsrc
-WORKDIR /meteorsrc
+ADD . /meteor/src
+WORKDIR /meteor/src/
 
 # Bundle meteorsrc to /var/www/app
-RUN mrt install && meteor bundle --directory /var/www/app
-
-# Set the working directory to be used for commands that are run, including the default CMD below
-RUN cd /var/www/app/programs/server && npm install
-WORKDIR /var/www/app
+RUN meteor build --directory /meteor
+RUN cd /meteor/bundle/programs/server/ && npm install
+WORKDIR /meteor/bundle
 
 #
-# Default ENV settings for meteor app
-# Required to run meteor!
+# Default Meteor ENV settings for meteor app
 # either change these or pass as --env in the docker run
 #
 ENV PORT 8080
 ENV ROOT_URL "http://127.0.0.1"
 ENV MONGO_URL "mongodb://127.0.0.1:3001/meteor"
-
+ENV DISABLE_WEBSOCKETS "1"
 
 # Expose container port 8080 to the host (outside the container)
 EXPOSE 8080
 
 RUN touch .foreverignore
+
 # Define default command that runs the node app on container port 8080
-CMD forever -w ./main.js
+CMD forever -w ./main.js
+
+
+# Clean up APT when done.
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /meteor/src
diff --git a/smart.json b/smart.json
diff --git a/smart.lock b/smart.lock

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-[email protected].1`
	`1`	`+[email protected].2.2`
-Original file line number
+Diff line change
@@ @@ -1,97 +1,103 @@ @@
 -accounts-base@1.0.1
 +accounts-base@1.1.0
 [email protected]
 -accounts-oauth@1.0.0
 +accounts-oauth@1.1.0
 [email protected]
 -accounts-ui-unstyled@1.0.1
 -alanning:[email protected].12
 -aldeed:autoform@1.0.0
 -aldeed:collection2@1.0.0
 +accounts-ui-unstyled@1.1.1
 +alanning:[email protected].13
 +aldeed:autoform@2.0.2
 +aldeed:collection2@2.1.0
 aldeed:[email protected]
 -aldeed:[email protected].1
 -aldeed:template-extension@1.0.0
 +aldeed:[email protected].3
 +aldeed:template-extension@2.0.0
 [email protected]
 -[email protected]
 -[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 [email protected]
 [email protected]
 [email protected]
 +[email protected]
 [email protected]
 cfs:[email protected]
 cfs:[email protected]
 cfs:[email protected]
 cfs:[email protected]
 cfs:[email protected]
 cfs:[email protected]
 -cfs:[email protected]
 +cfs:[email protected]
 +cfs:[email protected]
 cfs:[email protected]
 cfs:[email protected]
 cfs:[email protected]
 -cfs:[email protected].0
 +cfs:[email protected].1
 cfs:[email protected]
 cfs:[email protected]
 -cfs:[email protected]
 +cfs:[email protected]
 +cfs:[email protected]
 cfs:[email protected]
 -cfs:[email protected].0
 -cfs:[email protected].0
 +cfs:[email protected].2
 +cfs:[email protected].2
 cfs:[email protected]
 [email protected]
 -cmather:handlebars-server@0.2.0
 -[email protected].2
 +cmather:handlebars-server@2.0.0
 +[email protected].3
 [email protected]
 [email protected]
 [email protected]
 -dburles:collection-helpers@0.3.2
 +dburles:collection-helpers@1.0.0
 [email protected]
 -[email protected].2
 -[email protected].1
 +[email protected].3
 +[email protected].2
 [email protected]
 -[email protected]
 +[email protected]
 +[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 -[email protected].0
 -[email protected].4
 +[email protected].1
 +[email protected].5
 [email protected]
 iron:[email protected]
 iron:[email protected]
 iron:[email protected]
 iron:[email protected]
 [email protected]
 [email protected]
 -[email protected].7
 -[email protected].8
 +[email protected].8
 +[email protected].9
 [email protected]
 -[email protected]
 -matb33:[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 -[email protected]
 +[email protected]
 +matb33:[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 [email protected]
 -[email protected].4
 +[email protected].5
 mrt:[email protected]
 mrt:[email protected]
 [email protected]
 [email protected]
 [email protected]
 -oauth2@1.0.0
 -oauth@1.0.1
 +oauth2@1.1.0
 +oauth@1.1.0
 [email protected]
 [email protected]
 raix:[email protected]
 raix:[email protected]
 [email protected]
 -reactioncommerce:[email protected].5
 +reactioncommerce:[email protected].6
 reactioncommerce:[email protected]
 -reactioncommerce:[email protected].2
 +reactioncommerce:[email protected].3
 reactioncommerce:[email protected]
 -[email protected].1
 +[email protected].2
 [email protected]
 -reload@1.0.1
 +reload@1.1.0
 [email protected]
 -[email protected].0
 +[email protected].1
 sacha:[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 -[email protected].5
 +[email protected].6
 [email protected]
 -[email protected].1
 +[email protected].2
 [email protected]
 -[email protected]
 +[email protected]
 +[email protected]
 +[email protected]