Support the "order" key in "update_config" for compose

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
docker · Jul 28, 2017 · 2950667 · 2950667
1 parent 286216d
commit 2950667
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 2 deletions.
diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go
@@ -454,6 +454,7 @@ func convertUpdateConfig(source *composetypes.UpdateConfig) *swarm.UpdateConfig
 		FailureAction:   source.FailureAction,
 		Monitor:         source.Monitor,
 		MaxFailureRatio: source.MaxFailureRatio,
+		Order:           source.Order,
 	}
 }
 

diff --git a/cli/compose/convert/service_test.go b/cli/compose/convert/service_test.go
@@ -343,3 +343,21 @@ func TestConvertCredentialSpec(t *testing.T) {
 	assert.Error(t, err)
 	assert.Nil(t, swarmSpec)
 }
+
+func TestConvertUpdateConfigOrder(t *testing.T) {
+	// test default behavior
+	updateConfig := convertUpdateConfig(&composetypes.UpdateConfig{})
+	assert.Equal(t, "", updateConfig.Order)
+
+	// test start-first
+	updateConfig = convertUpdateConfig(&composetypes.UpdateConfig{
+		Order: "start-first",
+	})
+	assert.Equal(t, updateConfig.Order, "start-first")
+
+	// test stop-first
+	updateConfig = convertUpdateConfig(&composetypes.UpdateConfig{
+		Order: "stop-first",
+	})
+	assert.Equal(t, updateConfig.Order, "stop-first")
+}
diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml
@@ -31,6 +31,7 @@ services:
         failure_action: continue
         monitor: 60s
         max_failure_ratio: 0.3
+        order: start-first
       resources:
         limits:
           cpus: '0.001'

diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go
@@ -687,6 +687,7 @@ func TestFullExample(t *testing.T) {
 				FailureAction:   "continue",
 				Monitor:         time.Duration(60 * time.Second),
 				MaxFailureRatio: 0.3,
+				Order:           "start-first",
 			},
 			Resources: types.Resources{
 				Limits: &types.Resource{

diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go
diff --git a/cli/compose/schema/data/config_schema_v3.4.json b/cli/compose/schema/data/config_schema_v3.4.json
@@ -339,7 +339,10 @@
             "delay": {"type": "string", "format": "duration"},
             "failure_action": {"type": "string"},
             "monitor": {"type": "string", "format": "duration"},
-            "max_failure_ratio": {"type": "number"}
+            "max_failure_ratio": {"type": "number"},
+            "order": {"type": "string", "enum": [
+              "start-first", "stop-first"
+            ]}
           },
           "additionalProperties": false
         },

diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
@@ -187,6 +187,7 @@ type UpdateConfig struct {
 	FailureAction   string `mapstructure:"failure_action"`
 	Monitor         time.Duration
 	MaxFailureRatio float32 `mapstructure:"max_failure_ratio"`
+	Order           string
 }
 
 // Resources the resource limits and reservations