Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronjudd committed Feb 3, 2015
2 parents 06e6096 + b34a224 commit 6544735
Show file tree
Hide file tree
Showing 15 changed files with 315 additions and 109 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.build
.build.*
9 changes: 3 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
# .editorconfig
# Meteor adapted EditorConfig, http://EditorConfig.org
# By RaiX 2013

root = true

[*.js]
[*]
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
charset = utf-8

[*.js]
max_line_length = 80
indent_brace_style = 1TBS
spaces_around_operators = true
quote_type = auto
# curly_bracket_next_line = true
5 changes: 2 additions & 3 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ force-ssl
# Community Packages
nemo64:bootstrap
#mike:mocha
#anti:fake
#sanjo:jasmine

# Reaction Commerce Packages
reactioncommerce:core-theme
reactioncommerce:core
reactioncommerce:reaction-google-analytics
reactioncommerce:reaction-helloworld
reactioncommerce:reaction-shipping
reactioncommerce:reaction-paypal
reactioncommerce:reaction-braintree
reactioncommerce:reaction-stripe
reactioncommerce:reaction-stripe
#reactioncommerce:reaction-auth-net
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[email protected].2.1
[email protected].3.1
39 changes: 19 additions & 20 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[email protected]
[email protected]
[email protected]
[email protected].5
[email protected].5
[email protected].6
[email protected].6
alanning:[email protected]
aldeed:[email protected]
aldeed:[email protected]
Expand All @@ -12,7 +12,7 @@ aldeed:[email protected]
[email protected]
anti:[email protected]
[email protected]
[email protected].4
[email protected].5
[email protected]
[email protected]
[email protected]
Expand Down Expand Up @@ -40,13 +40,12 @@ cfs:[email protected]
cfs:[email protected]
cfs:[email protected]
cfs:[email protected]
[email protected].3
[email protected].4
cmather:[email protected]
[email protected]
d3js:[email protected]
dburles:[email protected]
dburles:[email protected]
[email protected].13
[email protected].14
[email protected]
[email protected]
[email protected]
Expand All @@ -59,7 +58,7 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].9
[email protected].10
[email protected]
iron:[email protected]
iron:[email protected]
Expand All @@ -69,7 +68,7 @@ iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
jquery@1.0.2
jquery@1.11.3
[email protected]
[email protected]
[email protected]
Expand Down Expand Up @@ -98,34 +97,34 @@ ongoworks:[email protected]
ongoworks:[email protected]
ongoworks:[email protected]
[email protected]
prinzdezibel:[email protected]
raix:[email protected]
raix:[email protected]
[email protected]
reactioncommerce:[email protected]
reactioncommerce:[email protected]
reactioncommerce:[email protected]
reactioncommerce:[email protected]
reactioncommerce:[email protected]
reactioncommerce:[email protected]
reactioncommerce:[email protected]
reactioncommerce:[email protected]
reactioncommerce:[email protected]
reactioncommerce:[email protected]
reactioncommerce:[email protected].1
reactioncommerce:reaction-stripe@1.0.0
reactioncommerce:[email protected].2
reactioncommerce:reaction-stripe@0.1.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].3
[email protected].4
sacha:[email protected]
[email protected]
[email protected]
[email protected]
[email protected].4
[email protected].5
[email protected]
[email protected]
[email protected]
[email protected].10
[email protected].4
[email protected].11
[email protected].5
[email protected]
[email protected]
[email protected]
[email protected].5
[email protected].6
[email protected]
107 changes: 71 additions & 36 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,59 +1,94 @@
############################################################
# Builds a Meteor 0.9.x+ application Docker image
#
# See: http://docs.docker.io/
# Builds a Meteor + Reaction + MongoDB Docker Image
#
# 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 #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
# Build:
#
# docker build -t ongoworks/reaction .
#
# Run Reaction, Meteor + local mongo:
#
# docker run -it --rm -p :49000:8080 --name reactioncommerce ongoworks/reaction
#
# Optional Meteor parameters (-e):
#
# ROOT_URL="< hostname>"
# MONGO_URL="<your mongodb connect string>"
# OPLOG_URL="<mongo oplog url>"
# PORT="<meteor port>"
# METEOR_SETTINGS="{json}"
# DISABLE_WEBSOCKETS="1"
#
# Reaction Specific parameter (-e):
#
# MAIL_URL="<smtp connection string>"
# METEOR_EMAIL="[email protected]"
# METEOR_USER="admin"
# METEOR_AUTH="password"
#
# Build parameters:
#
# REPO="https://github.com/reactioncommerce/reaction.git"
# BRANCH="master"
#
# Example use:
#
# docker run --rm -e ROOT_URL="http://testsite.com" \
# -e REPO="https://github.com/reactioncommerce/reaction.git" \
# -e BRANCH="master" \
# -e METEOR_EMAIL="[email protected]" \
# -e METEOR_USER="admin" \
# -e METEOR_AUTH="password" \
# -t ongoworks/reaction
#
#
##############################################################

FROM google/debian:wheezy
FROM mongo
MAINTAINER Aaron Judd <[email protected]>

# 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
ENV DEBIAN_FRONTEND noninteractive

# Install git, curl, python, etc
# Install imagemagick (optional for cfs:graphicsmagick)
RUN apt-get -qq update && apt-get install -qq -y curl python gcc make \
build-essential git ca-certificates nano chrpath libfreetype6 \
libfreetype6-dev libssl-dev libfontconfig1 imagemagick

# install node
RUN mkdir /nodejs && curl http://nodejs.org/dist/v0.10.33/node-v0.10.33-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

#install forever and phantomjs (optional for spiderable)
# Install forever & phantomjs
RUN npm install --silent -g forever phantomjs

# Install Meteor
# Install Meteor to /usr/src
RUN curl https://install.meteor.com | /bin/sh
ADD . /meteor/src
WORKDIR /meteor/src/
ADD . /usr/src/meteor
WORKDIR /usr/src/meteor/

# Bundle meteorsrc to /var/www/app
RUN meteor build --directory /meteor
RUN cd /meteor/bundle/programs/server/ && npm install
WORKDIR /meteor/bundle
# Make sure we have a directory for the application
RUN mkdir -p /var/www
RUN chown -R www-data:www-data /var/www

#
# 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"
# Bundle from /usr/src/meteor to /var/www
RUN meteor build --directory /var/www
RUN cd /var/www/bundle/programs/server/ && npm install
WORKDIR /var/www/bundle

# Install entrypoint
ADD bin/entrypoint.sh /usr/bin/entrypoint.sh
RUN chmod +x /usr/bin/entrypoint.sh

# 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
# Some housekeeping
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /meteor/src

# Start Meteor, Reaction and MongoDB
ENTRYPOINT ["/usr/bin/entrypoint.sh"]

# Clean up APT when done.
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /meteor/src
CMD []
29 changes: 20 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
#Reaction Commerce
A commerce platform developed with Meteor, Node.js, MongoDB, CoffeeScript following a reactive design pattern that puts usability and conversions first.

**Demonstration & Playground **
##Installation

http://reactioncommerce.com
To install Meteor + Reaction, and start the latest release:

At http://reactioncommerce.com you can launch a test shop, launched as a Docker container. *note: these are test shops, and not for production.*
```bash
curl -L http://getrxn.io/installreaction | /bin/sh
```

This terminal command executes [this file](https://github.com/reactioncommerce/reaction/blob/development/bin/install). Additional installation options are in the [developer documentation](https://github.com/reactioncommerce/reaction-core/blob/development/docs/installation.md).

##Demonstration

At [reactioncommerce.com](https://reactioncommerce.com) you can launch a test shop, launched as a Docker container.

*Note: These are test shops, and not for production.*

Test shops help us gather feedback for Reaction development, as well as testing [Launchdock](https://github.com/ongoworks/launchdock), the docker container management application we are building to deploy Reaction shops with.

Test shops help us in developing [Launchdock](https://github.com/ongoworks/launchdock), the docker container management application we are building to deploy Reaction shops with.

##Status
**Current status: Alpha Preview v0.2.2**
**Current status: Alpha Preview v0.2.3**

**Functional but unstable, with HEAVY ongoing development!**

Expand Down Expand Up @@ -52,15 +63,15 @@ And finally for the kanban-esque, hardcore real time progress view, take a look

#Feedback
###GitHub Issues
Our preferred method for Reaction feedback it that you use GitHub issues on the https://github.com/reactioncommerce/reaction project.
Our preferred method for Reaction feedback it that you use GitHub issues on the https://github.com/reactioncommerce/reaction project.

###Chat Rooom
### Chat Room
Join us on our Gitter chat room, discuss, get help.

[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/reactioncommerce/reaction?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

###Google Group
Google group at https://groups.google.com/forum/#!forum/reaction-talk
Google group at https://groups.google.com/forum/#!forum/reaction-talk

#Developer Documentation

Expand Down
Loading

0 comments on commit 6544735

Please sign in to comment.