Add support for volumes_from to the apps, templates and services cont…

…rollers.
CenturyLinkLabs · Oct 2, 2014 · 8ececad · 8ececad
1 parent c9443da
commit 8ececad
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/app/controllers/apps_controller.rb b/app/controllers/apps_controller.rb
@@ -77,7 +77,8 @@ def app_params
       environment: [[:variable, :value, :required]],
       ports: [[:host_interface, :host_port, :container_port, :proto]],
       expose: [],
-      volumes: [[:host_path, :container_path]]
+      volumes: [[:host_path, :container_path]],
+      volumes_from: [[:service]]
     )
   end
 

diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb
@@ -51,6 +51,7 @@ def service_params(extras=nil)
       ports: [[:host_interface, :host_port, :container_port, :proto]],
       expose: [],
       volumes: [[:host_path, :container_path]],
+      volumes_from: [[:service_id]],
       links: [[:service_id, :alias]],
       environment: [[:variable, :value, :required]]
     )

diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
@@ -49,8 +49,8 @@ def template_create_params
         expose: [],
         links: [[:service_id, :alias]],
         environment: [[:variable, :value, :required]],
-        links: [[:service_id, :alias]],
-        ports: [[:host_interface, :host_port, :container_port, :proto]]
+        ports: [[:host_interface, :host_port, :container_port, :proto]],
+        volumes_from: [[:service_id]]
       ]]
     )
   end

diff --git a/spec/controllers/templates_controller_spec.rb b/spec/controllers/templates_controller_spec.rb
@@ -43,6 +43,7 @@
               { 'variable' => 'GIT_REPO', 'value' => 'https://github.com/fermayo/hello-world-php.git' }
             ],
             'volumes' =>  [],
+            'volumes_from' =>  [{ 'service_id' => '3' }],
             'command' => '/start web'
           }
         ]