added ability to specify environment vars on container creation

Author: ehazlett

Diff for: containers/forms.py

@@ -45,6 +45,7 @@ class Meta:
 class CreateContainerForm(forms.Form):
     image = forms.ChoiceField()
     command = forms.CharField(required=False)
+    environment = forms.CharField(required=False, help_text='key=value space separated pairs')
     ports = forms.CharField(required=False, help_text='space separated')
     hosts = forms.MultipleChoiceField()
 

Diff for: containers/models.py

@@ -70,9 +70,11 @@ def get_images(self, show_all=False):
             cache.set(key, images, HOST_CACHE_TTL)
         return images
 
-    def create_container(self, image=None, command=None, ports=[]):
+    def create_container(self, image=None, command=None, ports=[],
+        environment=[]):
         c = self._get_client()
-        cnt = c.create_container(image, command, detach=True, ports=ports)
+        cnt = c.create_container(image, command, detach=True, ports=ports,
+            environment=environment)
         c.start(cnt.get('Id'))
         self._invalidate_container_cache()
 

Diff for: containers/views.py

@@ -33,16 +33,20 @@ def add_host(request):
 @login_required
 def create_container(request):
     form = CreateContainerForm(request.POST)
-    # TODO: create / start container
     image = form.data.get('image')
+    environment = form.data.get('environment')
     command = form.data.get('command')
     if command.strip() == '':
         command = None
+    if environment.strip() == '':
+        environment = None
+    else:
+        environment = environment.split()
     ports = form.data.get('ports', '').split()
     hosts = form.data.getlist('hosts')
     for i in hosts:
         host = Host.objects.get(id=i)
-        host.create_container(image, command, ports)
+        host.create_container(image, command, ports, environment=environment)
     messages.add_message(request, messages.INFO, _('Created') + ' {0}'.format(
         image))
     return redirect('dashboard.views.index')

Diff for: shipyard/settings.py

@@ -215,3 +215,12 @@
     from local_settings import *
 except ImportError:
     pass
+
+# create default admin user if not present
+from django.contrib.auth.models import User
+u, created = User.objects.get_or_create(username='admin')
+if created:
+    u.set_password('shipyard')
+    u.is_staff = True
+    u.is_superuser = True
+    u.save()

Diff for: shipyard/templatetags/shipyard.py

@@ -35,13 +35,12 @@ def container_port_links(value, host):
     if value:
         host = Host.objects.get(name=host)
         all_forwards = value.split(',')
-        print(all_forwards)
         for x in all_forwards:
             k,v = x.split('->')
             ports[k] = v
         for k,v in ports.items():
             link = '<a href="http://{0}:{1}" target="_blank">{1}->{2}</a>'.format(
-                host.hostname, k,v)
+                host.hostname, k.strip(), v.strip())
             links.append(link)
         ret = ', '.join(links)
     return ret

Diff for: wsgi.py

@@ -0,0 +1,6 @@
+from shipyard import wsgi
+#import newrelic.agent
+application = wsgi.application
+
+#newrelic.agent.initialize('newrelic.ini')
+#app = newrelic.agent.wsgi_application()(app)