Merge pull request #10 from mut3/master

Upgraded to use newest version of mongo & fixed data volume binds

docker/mongodb/Dockerfile

@@ -1,4 +1,4 @@
-FROM dockerfile/mongodb:latest
+FROM library/mongo:latest
 MAINTAINER Doug Smith <[email protected]>
 ENV build_date 2014-11-06
 

docker/nginx/Dockerfile

@@ -6,5 +6,5 @@ RUN mkdir /etc/nginx/ssl/
 COPY cert/nginx.crt /etc/nginx/ssl/nginx.crt
 COPY cert/nginx.key /etc/nginx/ssl/nginx.key
 RUN rm /etc/nginx/conf.d/default.conf
-RUN rm /etc/nginx/conf.d/example_ssl.conf
+# RUN rm /etc/nginx/conf.d/example_ssl.conf
 COPY nginx.conf /etc/nginx/nginx.conf

docker/utils/build_it.sh

@@ -5,7 +5,7 @@ EXAMPLE_DATA=$(pwd)/../../db/
 # ------------------ Basic requirements.
 
 echo "Pulling required docker containers...."
-docker pull dockerfile/mongodb:latest
+docker pull library/mongo:latest
 docker pull jpetazzo/dind:latest
 docker pull nginx:latest
 docker pull svendowideit/ambassador:latest
@@ -27,14 +27,14 @@ docker rm $(docker ps -a -q)
 echo "Running mongo for preload..."
 rm -Rf $MONGO_DIR
 mkdir $MONGO_DIR
-docker run -d -p 27017:27017 -v $MONGO_DIR/:/data/db --name temp_mongo dockerfile/mongodb
+docker run -d --privileged -v $MONGO_DIR:/data/db --name temp_mongo library/mongo
 
 CMD_RELEASE_IMPORT=""
 CMD_USER_IMPORT=""
 
 echo "Starting mongo client"
-docker run -it --rm --link temp_mongo:mongodb -v $EXAMPLE_DATA:/exampledata/ dockerfile/mongodb \
-    bash -c 'mongoimport --host mongodb --db bowline --collection releases --file /exampledata/json/releases.json; mongoimport --host mongodb --db bowline --collection users --file /exampledata/json/users.json'
+docker run -it --rm --link temp_mongo:mongo -v $EXAMPLE_DATA:/exampledata/ library/mongo \
+    bash -c 'mongoimport --host mongo --db bowline --collection releases --file /exampledata/json/releases.json; mongoimport --host mongo --db bowline --collection users --file /exampledata/json/users.json'
 
 echo "Cleaning up all containers...."
 docker kill $(docker ps -a -q) || true

docker/utils/run_it.sh

@@ -16,10 +16,10 @@ docker rm $(docker ps -a -q) || true
 
 echo "Starting registry server..."
 # docker run -p 5000:5000 --name regserver -d -t registry
-docker run -d -e GUNICORN_OPTS=[--preload] -v $REGISTRY_DIR:/registry -e SETTINGS_FLAVOR=local -e STORAGE_PATH=/registry -e SEARCH_BACKEND=sqlalchemy -p 5000:5000  --name regserver registry:latest
+docker run -d -e GUNICORN_OPTS=[--preload] --privileged -v $REGISTRY_DIR:/registry -e SETTINGS_FLAVOR=local -e STORAGE_PATH=/registry -e SEARCH_BACKEND=sqlalchemy -p 5000:5000  --name regserver registry:latest
 
-echo "Starting mongodb..."
-docker run -d -p 27017:27017 -v $MONGO_DIR:/data/db --name mongodb dockerfile/mongodb
+echo "Starting mongo..."
+docker run -d -p 27017:27017 --privileged -v $MONGO_DIR:/data/db --name mongo library/mongo
 
 echo "Starting nginx ambassador..."
 HOST_IP_ADDRESS=$(ifconfig | grep -a2 docker0 | grep -P "inet[^6]" | awk '{print $2}')
@@ -28,9 +28,10 @@ docker run -d --name nginx-amb --expose 443 -e NGINX_PORT_443_TCP=tcp://$HOST_IP
 echo "Starting bowline..."
 docker run \
     -p 8000:8000 \
+    --privileged \
     -v /var/run/docker.sock:/var/run/docker.sock \
     -v /bowline/ \
-    --link mongodb:mongodb \
+    --link mongo:mongo \
     --link nginx-amb:dockertest.com \
     --name bowline -d -t dougbtv/bowline
 

docs/RunningLocally.md

@@ -31,7 +31,7 @@ If you run a `docker ps` it should now look approximately like:
     62d6a179e9a4        dougbtv/bowline-nginx:latest     "nginx -g 'daemon of   A minute ago   Up         0.0.0.0:80->80/tcp, 0.0.0.0:443->443/tcp   determined_turing   
     ace84aa405f7        dougbtv/bowline:latest           "/bin/sh -c 'forever   A minute ago   Up         0.0.0.0:8000->8000/tcp                     bowline             
     1fb1bea5f4d3        svendowideit/ambassador:latest   "\"/bin/sh -c 'env |   A minute ago   Up         443/tcp                                    nginx-amb           
-    ae35ea4437e8        dockerfile/mongodb:latest        "mongod"               A minute ago   Up         28017/tcp, 0.0.0.0:27017->27017/tcp        mongodb             
+    ae35ea4437e8        library/mongo:latest        "mongod"               A minute ago   Up         28017/tcp, 0.0.0.0:27017->27017/tcp        mongodb             
     235d17f30e11        registry:latest                  "docker-registry"      A minute ago   Up         0.0.0.0:5000->5000/tcp                     regserver           
 
 Add `dockertest.com` to your hosts file:
@@ -45,7 +45,7 @@ And point a browser @ dockertest.com -- or do a `docker login https://dockertest
 You're building a couple docker containers, pulling another three, and running them. They are:
 
 * Bowline's backend (a REST-ish API created with Node.js)
-* A [MongoDB instance](https://registry.hub.docker.com/u/dockerfile/mongodb/) to store Bowline's data.
+* A [MongoDB instance](https://registry.hub.docker.com/_/mongo/) to store Bowline's data.
 * A [Docker registry](https://registry.hub.docker.com/_/registry/)
 * An nginx server to proxy requests between the Bowline API & the registry, and serve the front-end
 * An ambassador for nginx, as the Bowline & Nginx containers need both to know about one another.