Merge pull request #363 from opdemand/docker-0.7

Update App.run for docker 0.7 and slugrunner syntax

Author: mboersma

api/models.py

@@ -531,6 +531,7 @@ def logs(self):
 
     def run(self, command):
         """Run a one-off command in an ephemeral app container."""
+        # TODO: add support for interactive shell
         nodes = self.formation.node_set.filter(layer__runtime=True).order_by('?')
         if not nodes:
             raise EnvironmentError('No nodes available to run command')
@@ -539,12 +540,9 @@ def run(self, command):
         # prepare ssh command
         version = release.version
         docker_args = ' '.join(
-            ['-v',
-             '/opt/deis/runtime/slugs/{app_id}-{version}/app:/app'.format(**locals()),
-             release.build.image])
-        base_cmd = "export HOME=/app; cd /app && for profile in " \
-                   "`find /app/.profile.d/*.sh -type f`; do . $profile; done"
-        command = "/bin/sh -c '{base_cmd} && {command}'".format(**locals())
+            ['-a', 'stdout', '-a', 'stderr',
+             '-v', '/opt/deis/runtime/slugs/{app_id}-v{version}:/app'.format(**locals()),
+             'deis/slugrunner'])
         command = "sudo docker run {docker_args} {command}".format(**locals())
         return node.run(command)
 

contrib/ec2/prepare-ubuntu-ami.sh

@@ -39,15 +39,15 @@ apt-get update
 apt-get dist-upgrade -yq
 
 # install required packages
-apt-get install lxc-docker-0.6.4 curl git make python-setuptools python-pip -yq
-
-# create buildstep docker image
-git clone -b deis https://github.com/opdemand/buildstep.git
-cd buildstep
-git checkout deis
-make
-cd ..
-rm -rf buildstep
+apt-get install lxc-docker-0.7.1 curl git make python-setuptools python-pip -yq
+
+# wait for docker to start
+while [ ! -e /var/run/docker.sock ] ; do
+  inotifywait -t 2 -e create $(dirname /var/run/docker.sock)
+done
+
+# pull progrium/cedarish docker image
+docker pull progrium/cedarish
 
 # install chef 11.x deps
 apt-get install -yq ruby1.9.1 ruby1.9.1-dev make

contrib/ec2/provision-ec2-controller.sh

@@ -45,21 +45,21 @@ region=$1
 # see contrib/prepare-ubuntu-ami.sh for instructions
 # on creating your own deis-optmized AMIs
 if [ "$region" == "ap-northeast-1" ]; then
-  image=ami-2bd9bf2a
+  image=ami-6399f962
 elif [ "$region" == "ap-southeast-1" ]; then
-  image=ami-2821757a
+  image=ami-0a87d358
 elif [ "$region" == "ap-southeast-2" ]; then
-  image=ami-4dfd6277
+  image=ami-c3bd22f9
 elif [ "$region" == "eu-west-1" ]; then
-  image=ami-0452be73
+  image=ami-4826c83f
 elif [ "$region" == "sa-east-1" ]; then
-  image=ami-87f9589a
+  image=ami-79bf1e64
 elif [ "$region" == "us-east-1" ]; then
-  image=ami-5f84a536
+  image=ami-e7af828e
 elif [ "$region" == "us-west-1" ]; then
-  image=ami-f80c3dbd
+  image=ami-a06e5ee5
 elif [ "$region" == "us-west-2" ]; then
-  image=ami-76ad3746
+  image=ami-28abce18
 else
   echo "Cannot find AMI for region: $region"
   exit 1

contrib/rackspace/prepare-rackspace-image.sh

@@ -40,14 +40,15 @@ apt-get update
 apt-get dist-upgrade -yq
 
 # install required packages
-apt-get install lxc-docker-0.6.4 curl git make python-setuptools python-pip -yq
-
-# create buildstep docker image
-git clone -b deis https://github.com/opdemand/buildstep.git
-cd buildstep
-make
-cd ..
-rm -rf buildstep
+apt-get install lxc-docker-0.7.1 curl git make python-setuptools python-pip -yq
+
+# wait for docker to start
+while [ ! -e /var/run/docker.sock ] ; do
+  inotifywait -t 2 -e create $(dirname /var/run/docker.sock)
+done
+
+# pull progrium/cedarish docker image
+docker pull progrium/cedarish
 
 # install chef 11.x deps
 apt-get install -yq ruby1.9.1 ruby1.9.1-dev make

contrib/vagrant/prepare-ubuntu-box.sh

@@ -42,14 +42,15 @@ apt-get update
 apt-get dist-upgrade -yq
 
 # install required packages
-apt-get install lxc-docker-0.6.4 git make python-setuptools python-pip -yq
-
-# create buildstep docker image
-git clone -b deis https://github.com/opdemand/buildstep.git
-cd buildstep
-make
-cd ..
-rm -rf buildstep
+apt-get install lxc-docker-0.7.1 git make python-setuptools python-pip -yq
+
+# wait for docker to start
+while [ ! -e /var/run/docker.sock ] ; do
+  inotifywait -t 2 -e create $(dirname /var/run/docker.sock)
+done
+
+# pull progrium/cedarish docker image
+docker pull progrium/cedarish
 
 # install chef 11.x deps
 apt-get install -yq ruby1.9.1 ruby1.9.1-dev make

provider/ec2.py

@@ -17,14 +17,14 @@
 # Deis-optimized EC2 amis -- with 3.8 kernel, chef 11 deps,
 # and large docker images (e.g. buildstep) pre-installed
 IMAGE_MAP = {
-    'ap-northeast-1': 'ami-2bd9bf2a',
-    'ap-southeast-1': 'ami-2821757a',
-    'ap-southeast-2': 'ami-4dfd6277',
-    'eu-west-1': 'ami-0452be73',
-    'sa-east-1': 'ami-87f9589a',
-    'us-east-1': 'ami-5f84a536',
-    'us-west-1': 'ami-f80c3dbd',
-    'us-west-2': 'ami-76ad3746',
+    'ap-northeast-1': 'ami-6399f962',
+    'ap-southeast-1': 'ami-0a87d358',
+    'ap-southeast-2': 'ami-c3bd22f9',
+    'eu-west-1': 'ami-4826c83f',
+    'sa-east-1': 'ami-79bf1e64',
+    'us-east-1': 'ami-e7af828e',
+    'us-west-1': 'ami-a06e5ee5',
+    'us-west-2': 'ami-28abce18',
 }