rename start.sh to start-docker.sh

Dockerfile

@@ -1,7 +1,5 @@
 FROM jruby:1.7
 
-# RUN apt-get update && apt-get install -y gettext
-
 COPY Gemfile* /tmp/
 WORKDIR /tmp
 RUN bundle install
@@ -12,7 +10,7 @@ RUN mkdir $app
 WORKDIR $app
 ADD . $app
 
-RUN chmod +x start.sh
+RUN chmod +x start-docker.sh
 RUN echo "SECRET_TOKEN: '$(rake secret)'" > config/application.yml
 
 # these steps are done by start.sh:
@@ -22,4 +20,4 @@ RUN echo "SECRET_TOKEN: '$(rake secret)'" > config/application.yml
 
 EXPOSE 3000
 
-CMD [ "./start.sh" ]
+CMD [ "./start-docker.sh" ]

docker-compose.yml

@@ -4,8 +4,10 @@ app:
     - "3000:3000"
   links:
    - mongo
-mongo:
-  image: mongo:3.0
+# For development, use a path on your docker-host for /dev/twitarr
+# This loads your host files into the container, getting updates without a rebuild.
+# volumes:
+#  - /dev/twitarr:/srv/app
 
-# todo - volumes for app, and volumes-from for mongo
-# though it sounds like docker-compose takes care of the second (locally)
+mongo:
+  image: mongo:3.0

start.sh → start-docker.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Complete the application config while running in docker, then start rails.
+#
+# If you're *not* running in docker. you probably want to run `rails server` instead
+
 set -e
 set -x