Merge f368849 into 30e83cd

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## Unversioned
 ### Fixed
 - \#3790 - Remove Docker on submit if no image is provided
+- \#3794 - Applications with Docker volumes are mistakenly treated as stateful
+  applications
 
 ## 1.1.2 - 2016-04-14
 ### Fixed

src/js/mixins/AppActionsHandlerMixin.jsx

@@ -54,6 +54,13 @@ var callErrorDialog = function (settings) {
   });
 };
 
+var isStatefulApp = function (app) {
+  return app.container != null &&
+    app.container.volumes != null &&
+    app.container.volumes
+      .some(volume => volume.persistent != null || volume.external != null);
+};
+
 var AppActionsHandlerMixin = {
   componentWillMount: function () {
     if (this.props.model == null) {
@@ -197,9 +204,7 @@ var AppActionsHandlerMixin = {
       if (instancesString != null && instancesString !== "") {
         let instances = parseInt(instancesString, 10);
 
-        if (model.container != null && model.container.volumes != null &&
-          model.instances > instances
-        ) {
+        if (isStatefulApp(model) && model.instances > instances) {
           this.handleScaleDownVolumeApp(instances);
           return;
         }
@@ -218,7 +223,7 @@ var AppActionsHandlerMixin = {
       actionButtonLabel: "Continue Scaling",
       message: (
         <div>
-          <div>Scaling down ${appId} will cause any existing local volumes to
+          <div>Scaling down {appId} will cause any existing local volumes to
             be detached from destroyed instances. <a
                 href={ExternalLinks.LOCAL_VOLUMES}
                 target="_blank"
@@ -293,9 +298,7 @@ var AppActionsHandlerMixin = {
     });
 
     DialogStore.handleUserResponse(dialogId, () => {
-      if (model.container != null &&
-          model.container.volumes != null &&
-          model.container.volumes.length > 0) {
+      if (isStatefulApp(model) && model.instances > instances) {
         this.handleScaleDownVolumeApp(0);
         return;
       }