Browse code

Merge pull request #31075 from vieux/switch_to_new_versioning_scheme

Switch to new versioning scheme

Victor Vieux authored on 2017/02/18 08:43:28
Showing 5 changed files
... ...
@@ -1 +1 @@
1
-1.14.0-dev
1
+17.04.0-dev
... ...
@@ -44,7 +44,7 @@ info:
44 44
 
45 45
     The API is usually changed in each release of Docker, so API calls are versioned to ensure that clients don't break.
46 46
 
47
-    For Docker Engine 1.14, the API version is 1.27. To lock to this version, you prefix the URL with `/v1.27`. For example, calling `/info` is the same as calling `/v1.27/info`.
47
+    For Docker Engine 17.04, the API version is 1.27. To lock to this version, you prefix the URL with `/v1.27`. For example, calling `/info` is the same as calling `/v1.27/info`.
48 48
 
49 49
     Engine releases in the near future should support this version of the API, so your client will continue to work even if it is talking to a newer Engine.
50 50
 
... ...
@@ -52,7 +52,7 @@ info:
52 52
 
53 53
     The API uses an open schema model, which means server may add extra properties to responses. Likewise, the server will ignore any extra query parameters and request body properties. When you write clients, you need to ignore additional properties in responses to ensure they do not break when talking to newer Docker daemons.
54 54
 
55
-    This documentation is for version 1.27 of the API, which was introduced with Docker 1.14. Use this table to find documentation for previous versions of the API:
55
+    This documentation is for version 1.27 of the API, which was introduced with Docker 17.04. Use this table to find documentation for previous versions of the API:
56 56
 
57 57
     Docker version  | API version | Changes
58 58
     ----------------|-------------|---------
... ...
@@ -1686,7 +1686,7 @@ definitions:
1686 1686
           NanoCPUs: 4000000000
1687 1687
           MemoryBytes: 8272408576
1688 1688
         Engine:
1689
-          EngineVersion: "1.14.0"
1689
+          EngineVersion: "17.04.0"
1690 1690
           Labels:
1691 1691
             foo: "bar"
1692 1692
           Plugins:
... ...
@@ -5229,13 +5229,13 @@ paths:
5229 5229
                 type: "string"
5230 5230
           examples:
5231 5231
             application/json:
5232
-              Version: "1.14.0"
5232
+              Version: "17.04.0"
5233 5233
               Os: "linux"
5234 5234
               KernelVersion: "3.19.0-23-generic"
5235
-              GoVersion: "go1.6.3"
5235
+              GoVersion: "go1.7.5"
5236 5236
               GitCommit: "deadbee"
5237 5237
               Arch: "amd64"
5238
-              ApiVersion: "1.26"
5238
+              ApiVersion: "1.27"
5239 5239
               MinAPIVersion: "1.12"
5240 5240
               BuildTime: "2016-06-14T07:09:13.444803460+00:00"
5241 5241
               Experimental: true
... ...
@@ -184,7 +184,7 @@ func parseSecurityOpt(container *container.Container, config *containertypes.Hos
184 184
 			con = strings.SplitN(opt, "=", 2)
185 185
 		} else if strings.Contains(opt, ":") {
186 186
 			con = strings.SplitN(opt, ":", 2)
187
-			logrus.Warn("Security options with `:` as a separator are deprecated and will be completely unsupported in 1.14, use `=` instead.")
187
+			logrus.Warn("Security options with `:` as a separator are deprecated and will be completely unsupported in 17.04, use `=` instead.")
188 188
 		}
189 189
 
190 190
 		if len(con) != 2 {
... ...
@@ -353,7 +353,7 @@ Try {
353 353
     $gitCommit=Get-GitCommit
354 354
     if ($CommitSuffix -ne "") { $gitCommit += "-"+$CommitSuffix -Replace ' ', '' }
355 355
 
356
-    # Get the version of docker (eg 1.14.0-dev)
356
+    # Get the version of docker (eg 17.04.0-dev)
357 357
     $dockerVersion=Get-DockerVersion
358 358
 
359 359
     # Give a warning if we are not running in a container and are building binaries or running unit tests.
... ...
@@ -9,7 +9,7 @@
9 9
      The commit string. This is calculated externally to this script.
10 10
 
11 11
 .PARAMETER DockerVersion
12
-     The version such as 1.14.0-dev. This is calculated externally to this script.
12
+     The version such as 17.04.0-dev. This is calculated externally to this script.
13 13
 #>
14 14
 
15 15
 param(