chore(docker): move deis meta project to contrib/docker

Author: Gabriel Monroy

deis/Dockerfile contrib/docker/Dockerfiledeis/Dockerfile renamed to contrib/docker/Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get install -yq aufs-tools iptables ca-certificates
 RUN echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
 RUN apt-get update -q
-RUN apt-get install -yq lxc-docker-0.9.0
+RUN apt-get install -yq lxc-docker-0.9.1
 
 # add scripts to /app/bin
 RUN mkdir -p /app

deis/Makefile contrib/docker/Makefiledeis/Makefile renamed to contrib/docker/Makefile

@@ -1,35 +1,11 @@
-#
-# Deis Makefile
-#
-DEIS_IMAGE=deis/deis:latest
-DEIS_NAME=deis
-DISCOVERY_PORT=4001
-DISCOVERY_PEER_PORT=7001
-DISCOVERY_IMAGE=deis/discovery:latest
-DISCOVERY_NAME=deis-discovery
-LOGGER_PORT=514
-LOGGER_IMAGE=deis/logger:latest
-LOGGER_NAME=deis-logger
-DATABASE_PORT=5432
-DATABASE_IMAGE=deis/database:latest
-DATABASE_NAME=deis-database
-CACHE_PORT=6379
-CACHE_IMAGE=deis/cache:latest
-CACHE_NAME=deis-cache
-CONTROLLER_PORT=8000
-CONTROLLER_IMAGE=deis/controller:latest
-CONTROLLER_NAME=deis-controller
-# uses docker0 bridge for inter-container communication
-# this assumes the address is static
-ETCD=172.17.42.1:4001
-
 all: build run
 
 build:
 	docker build -t deis/deis:latest .
 
 run:
-	docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock deis/deis
+	docker run --privileged deis/deis
+	#docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock deis/deis
 
 stop:
 	-docker stop $(DISCOVERY_NAME)

deis/Vagrantfile contrib/docker/Vagrantfiledeis/Vagrantfile renamed to contrib/docker/Vagrantfile

@@ -24,20 +24,10 @@ Vagrant.configure("2") do |config|
     echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
     apt-get update -q
-    apt-get install -yq lxc lxc-docker-0.9.0
+    apt-get install -yq lxc lxc-docker-0.9.1
     # bind to private interface
     sed -i -e 's/#DOCKER_OPTS="-dns 8.8.8.8 -dns 8.8.4.4"/DOCKER_OPTS="-e lxc -H unix:\\/\\/var\\/run\\/docker.sock -H tcp:\\/\\/192.168.61.100:4243"/' /etc/default/docker
     restart docker
-    echo
-    echo To connect to the Docker Host:
-    echo
-    echo    export DOCKER_HOST=tcp://192.168.61.100:4243
   SCRIPT
 
-end
-
-# If you want to do some funky custom stuff to your box, but don't want those things tracked by git,
-# add a Vagrantfile.local and it will be included. You can use the exact same syntax as above. For
-# example if you're low on RAM you can boot the VM with less RAM. Note that 2GB is recommended
-# for installation, but you may be able to get away with 1GB once everything is installed.
-load "Vagrantfile.local" if File.exists? "Vagrantfile.local"
+end