Browse code

Updated developer doc to explain included static cli and move of cli moby->docker-ce.

Signed-off-by: Brett Randall <javabrett@gmail.com>

Brett Randall authored on 2017/12/02 15:42:59
Showing 1 changed files
... ...
@@ -186,13 +186,65 @@ can take over 15 minutes to complete.
186 186
    hack/make.sh binary install-binary run
187 187
    ```
188 188
 
189
-9. Inside your container, check your Docker version.
189
+9. Inside your container, check your Docker versions:
190 190
 
191 191
    ```none
192
-   root@5f8630b873fe:/go/src/github.com/docker/docker# docker --version
193
-   Docker version 1.12.0-dev, build 6e728fb
192
+   # docker version
193
+   Client:
194
+    Version:      17.06.0-ce
195
+    API version:  1.30
196
+    Go version:   go1.8.3
197
+    Git commit:   02c1d87
198
+    Built:        Fri Jun 23 21:15:15 2017
199
+    OS/Arch:      linux/amd64
200
+
201
+   Server:
202
+    Version:      dev
203
+    API version:  1.35 (minimum version 1.12)
204
+    Go version:   go1.9.2
205
+    Git commit:   4aa6362da
206
+    Built:        Sat Dec  2 05:22:42 2017
207
+    OS/Arch:      linux/amd64
208
+    Experimental: false
194 209
    ```
195 210
 
211
+   Notice the split versions between client and server, which might be
212
+   unexpected. In more recent times the Docker CLI component (which provides the
213
+   `docker` command) has split out from the Moby project and is now maintained in:
214
+   
215
+   * [docker/cli](https://github.com/docker/cli) - The Docker CLI source-code;
216
+   * [docker/docker-ce](https://github.com/docker/docker-ce) - The Docker CE
217
+     edition project, which assembles engine, CLI and other components.
218
+   
219
+   The Moby project now defaults to a [fixed
220
+   version](https://github.com/docker/docker-ce/commits/v17.06.0-ce) of the
221
+   `docker` CLI for integration tests.
222
+
223
+   You may have noticed the following message when starting the container with the `shell` command:
224
+   
225
+   ```none
226
+   Makefile:123: The docker client CLI has moved to github.com/docker/cli. For a dev-test cycle involving the CLI, run:
227
+   DOCKER_CLI_PATH=/host/path/to/cli/binary make shell
228
+   then change the cli and compile into a binary at the same location.
229
+   ```
230
+
231
+   By setting `DOCKER_CLI_PATH` you can supply a newer `docker` CLI to the
232
+   server development container for testing and for `integration-cli`
233
+   test-execution:
234
+
235
+   ```none
236
+   make DOCKER_CLI_PATH=/home/ubuntu/git/docker-ce/components/packaging/static/build/linux/docker/docker BIND_DIR=. shell
237
+   ...
238
+   # which docker
239
+   /usr/local/cli/docker
240
+   # docker --version
241
+   Docker version 17.09.0-dev, build 
242
+   ```
243
+
244
+    This Docker CLI should be built from the [docker-ce
245
+    project](https://github.com/docker/docker-ce) and needs to be a Linux
246
+    binary.
247
+
196 248
    Inside the container you are running a development version. This is the version
197 249
    on the current branch. It reflects the value of the `VERSION` file at the
198 250
    root of your `docker-fork` repository.