Commit Graph

36042 Commits

Author SHA1 Message Date
ccdf90d524 Merge pull request #237 from thaJeztah/17.09-more-yaml-information
[17.09] Add more information to the generated YAML for documentation
2017-09-20 16:33:29 -07:00
390c0782bc Add more information about commands to generated YAML docs
This patch adds aditional information about commands to the YAML files
that are generated for the reference documentation.

The following fields are added for each command:

Property          | Type      | Description
------------------|-----------|---------------------------------------------------------------------------------------
deprecated        | Boolean   | Indicates if the command is marked deprecated
min_api_version   | String    | The API version required to use this command (e.g. "1.23")
experimental      | Boolean   | Indicates if the command requires the daemon to run with experimental features enabled

For example (taken from the experimental `docker checkpoint create` command):

    command: docker checkpoint create
    short: Create a checkpoint from a running container
    long: Create a checkpoint from a running container
    usage: docker checkpoint create [OPTIONS] CONTAINER CHECKPOINT
    pname: docker checkpoint
    plink: docker_checkpoint.yaml
    options:
    - option: checkpoint-dir
      value_type: string
      description: Use a custom checkpoint storage directory
      deprecated: false
      experimental: false
    - option: leave-running
      value_type: bool
      default_value: "false"
      description: Leave the container running after checkpoint
      deprecated: false
      experimental: false
    deprecated: false
    min_api_version: "1.25"
    experimental: true

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

(cherry picked from commit 1f48e75c5c)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-19 14:17:58 +02:00
f238e40c68 Add more information about command flags to generated YAML docs
This patch adds aditional information about command flags to the YAML files
that are generated for the reference documentation.

The following fields are added for each flag:

Property          | Type      | Description
------------------|-----------|---------------------------------------------------------------------------------------
value_type        | String    | The "type" of value to be passed to this flag (e.g., `uint64`, `list`)
deprecated        | Boolean   | Indicates if the flag is marked deprecated
min_api_version   | String    | The API version required to use this flag (e.g. "1.23")
experimental      | Boolean   | Indicates if the flag requires the daemon to run with experimental features enabled

For example (taken from the `docker image build` command):

    - option: security-opt
      value_type: stringSlice
      default_value: '[]'
      description: Security options
      deprecated: false
      experimental: false
    - option: shm-size
      value_type: bytes
      default_value: "0"
      description: Size of /dev/shm
      deprecated: false
      experimental: false
    - option: squash
      value_type: bool
      default_value: "false"
      description: Squash newly built layers into a single new layer
      deprecated: false
      min_api_version: "1.25"
      experimental: true

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

(cherry picked from commit a8ba6f93d9)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-19 14:17:51 +02:00
393d90ba3d Fix variable shadowing causing LayersSize to be reported as 0
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
(cherry picked from commit 313bc1e339fa4292d9ef5bc74acc82436eab7e1e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-19 10:16:52 +02:00
22cec742b1 Fix fetching LVM2 sources
Version 2.02.173 has disappeared, let's revert back to latest stable
one.

https://github.com/moby/moby/issues/34843

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit a436d8a634392f9e82b6930a560d56900d887ce7)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-09-13 17:05:37 -07:00
17db25d098 Merge pull request #227 from andrewhsu/rc2
[17.09] bump version to 17.09.0-ce-rc2
2017-09-13 14:05:25 -07:00
9e5777a749 LCOW: Spot fix for multi-os image pulling
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit b291f5a31728f7ff6386bb37f15e7c0885d3b2a7)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-09-13 12:38:48 -07:00
c6e21043d8 Use a local copy of ParseLogDetails
It's being removed from client/

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit a747389bf4)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-09-13 10:46:14 -07:00
7034626ac6 vndr github.com/docker/docker to 84144a8 to fix stuff
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 850b46e67c)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-09-12 17:53:14 -07:00
1fa0e54ee7 remove unused vndr github.com/docker/libtrust
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 536da4a07a)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-09-12 16:02:43 -07:00
5f31b291fb vndr golang.org/x/sys to 07c1829
To satisfy requirements of the vndr of docker/docker

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 50696bbf72)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-09-12 16:02:36 -07:00
172695debf vndr docker/docker to ea220e7 to bring in fix for arm
Primarily to bring in fix for "Clear Architecture field in platform
constraint for arm architectures".

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit ef027b6d72)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-09-12 16:02:29 -07:00
49f307c88f Revert "Add skip for known failure"
This reverts commit b33e8d49d4.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-09-12 15:52:22 -07:00
e6067b8038 Remove unused depdendencies from vendor
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 724f03bb23)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-09-08 16:03:45 -07:00
49c9ca25c0 updated vendoring
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
(cherry picked from commit a0113c3a44)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-09-08 16:03:45 -07:00
21154792a5 Merge pull request #225 from seemethere/fix_metalinter_conversion_errors
[17.09] Fix metalinter conversion errors
2017-09-08 16:00:36 -07:00
b4a675c535 bump version to 17.09.0-ce-rc2
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-09-07 13:12:13 -07:00
dff328c8a6 Fix a bad assumption
If the empty variable happens to be sorted to the end of the list then TrimSpace()
would remove it. Instead only strip the single trailing newline.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit fff605c3b3557acf6bf793813d695fba59d7fa21)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-09-07 11:40:46 -07:00
2b763fa480 overlay gd: fix build for 32-bit ARM
This commit reverts a hunk of commit 2f5f0af3f ("Add unconvert linter")
and adds a hint for unconvert linter to ignore excessive conversion as
it is required on 32-bit platforms (e.g. armhf).

The exact error on armhf is this:

	19:06:45 ---> Making bundle: dynbinary (in bundles/17.06.0-dev/dynbinary)
	19:06:48 Building: bundles/17.06.0-dev/dynbinary-daemon/dockerd-17.06.0-dev
	19:10:58 # github.com/docker/docker/daemon/graphdriver/overlay
	19:10:58 daemon/graphdriver/overlay/copy.go:161: cannot use stat.Atim.Sec (type int32) as type int64 in argument to time.Unix
	19:10:58 daemon/graphdriver/overlay/copy.go:161: cannot use stat.Atim.Nsec (type int32) as type int64 in argument to time.Unix
	19:10:58 daemon/graphdriver/overlay/copy.go:162: cannot use stat.Mtim.Sec (type int32) as type int64 in argument to time.Unix
	19:10:58 daemon/graphdriver/overlay/copy.go:162: cannot use stat.Mtim.Nsec (type int32) as type int64 in argument to time.Unix

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 0120303d8ea4a1d9f8920ac4dba80521072e8536)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-09-06 16:07:27 -07:00
8227e4e739 Fix 'make all' for other platforms
Since commit d7e2c4ce7 ("Use gometalinter for linting") command
"make all" fails on all the non-default platforms (i.e. ARMs, PPC, and
s390) in this way:

	# make all
	...
	Congratulations!  All commits are properly signed with the DCO!
	/go/src/github.com/docker/docker/hack/validate/gometalinter: line 6: gometalinter: command not found
	Makefile:105: recipe for target 'all' failed
	make: *** [all] Error 127

Make sure gometalinter is installed for those platforms

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 0c0047e67f8ee73f73465ac60ccebbd16260ab46)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-09-06 16:07:27 -07:00
a0a9bbd3f2 re-enable some conversion for darwin-amd64 platform
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
(cherry picked from commit 7c9e64a2e1891bf1020d9312a18741c734fa1cd6)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-09-06 16:06:15 -07:00
ae21824df8 Merge pull request #223 from seemethere/bump_17090rc1
[17.09] bump version to 17.09.0-ce-rc1
2017-09-06 15:22:01 -07:00
b33e8d49d4 Add skip for known failure
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-09-06 13:41:55 -07:00
5d1587e61e Changes error check form NotNil to IsNil
rmi -f always returns a 0 exit code so these tests needed to be changed
accordingly.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-09-06 11:30:29 -07:00
8574cd6b8a bump version to 17.09.0-ce-rc1
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-09-05 17:06:13 -07:00
efd69761fc Fix integration suite and propagate failures
Failures from the integration suite were not propagating to the outter shell
for some reason. Handle the failure with an if exit 1.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 96707bc600747257e82917ca079fa5006d636b2c)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-09-05 14:58:05 -07:00
e3e65f6470 force inspect test format
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 8e6567cb837e1c885de5146517557c7a5d8a5f17)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-09-05 13:37:34 -07:00
f6c2d4d077 Merge component 'engine' from git@github.com:moby/moby master 2017-09-01 17:28:12 -07:00
adef76604d Merge component 'cli' from git@github.com:docker/cli master 2017-09-01 16:25:12 -07:00
5a2228df09 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-09-01 16:10:15 -07:00
80e330e43c Merge pull request #34706 from dnephin/fix-ci-master
Fix lint errors on master
Upstream-commit: 9b4a616e4b3819ef062780b5fd854616be2c22bb
Component: engine
2017-09-01 15:45:32 -07:00
cc688b2215 Remove RPM changelog
We haven't been updating it, seems like a waste to just track releases
through it.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 895abef8259363895fda4587f5a157f588608234
Component: packaging
2017-09-01 15:25:26 -07:00
7ded486a94 Merge pull request #34700 from tklauser/pkg-term-winsize
pkg/term: use IoctlGetWinsize/IoctlSetWinsize from golang.org/x/sys/unix
Upstream-commit: a127269803b9053713cd51d20f4ae00dae19b6d1
Component: engine
2017-09-01 15:58:25 -04:00
7ecd17f5d0 Fix lint errors.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d0dbf8e397afe0365be59f98e5f52bb4d8d3f4e5
Component: engine
2017-09-01 15:12:22 -04:00
ec509204fd Merge pull request #34689 from chchliang/envunitest
add an exception case
Upstream-commit: a301f96df6f951027a0c795e9d72ef657b51c2f9
Component: engine
2017-09-01 10:53:42 -07:00
8ef302a435 Merge pull request #34625 from dnephin/more-linters
Add interfacer and unconvert linters
Upstream-commit: cb952bf00695b3429476f59c5534a9c604c6f010
Component: engine
2017-09-01 08:46:08 -07:00
2be7b6733b pkg/term: use IoctlGetWinsize/IoctlSetWinsize from golang.org/x/sys/unix
Use unix.IoctlGetWinsize and unix.IoctlSetWinsize instead of manually
reimplementing them.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Upstream-commit: 32dfc0cb64992aa5e208273658b6e404268c63f4
Component: engine
2017-09-01 14:43:09 +02:00
4e9d201c36 add an exception case and map changge to struct with expect error
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>

add an exception case and map changge to struct with expect error

Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
Upstream-commit: 76e9f0d6d45d7464c34223c25337128530b1a0c6
Component: engine
2017-09-01 15:49:56 +08:00
f119dacce1 Merge pull request #485 from seemethere/re_add_test_target
Re-adds test target to the Makefile
Upstream-commit: d861a1c3dd
Component: cli
2017-08-31 17:50:14 -07:00
dfa6a23587 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-08-31 17:11:47 -07:00
b508d80e8c Merge pull request #47 from andrewhsu/libudev-dev
added libudev-dev pkg as build requirement
Upstream-commit: 88b7df7cde5e989d9622d009f4e7373ccbcfe828
Component: packaging
2017-08-31 17:10:18 -07:00
c57dae8fc6 remove debian-wheezy armv7l dockerfile build env
Because we don't ship it.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: cbcf1f67165278fc789d3c68b2965a05dbf823c9
Component: packaging
2017-08-31 16:26:00 -07:00
827348367b added libudev-dev pkg as build requirement
For jessie and wheezy flavors of distros. Some dep seems to have changed
from before.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: be93a43e60b60befd6d6688e0cb8e23bc27c0724
Component: packaging
2017-08-31 16:24:25 -07:00
6742eeff7c Remove assertions that were testing CLI behaviour.
These tests will be moved to docker/cli

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6590ee0dfba45d7eb4ee12f72621b90294925f20
Component: engine
2017-08-31 18:19:17 -04:00
d48b9a840a Merge pull request #489 from dnephin/fix-container-run
Fix crash in container run after pulling an image
Upstream-commit: d817967647
Component: cli
2017-08-31 18:11:26 -04:00
5ed8076112 Merge pull request #484 from ripcurld0/ps_exit_1
When nothing found in stack exit with exit code 1
Upstream-commit: 5a9bf7f359
Component: cli
2017-08-31 17:13:00 -04:00
264557313d Fix crash in containe run after pulling an image.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a0d8d80250
Component: cli
2017-08-31 17:08:02 -04:00
fdee4e99e9 Re-adds test target to the Makefile
The test target existed before, this is to provide a legacy interface to
allow easy testing for downstream Docker CE.

Without this we would need separate Makefiles/Jenkinsfiles for releases
past 17.07. Later on this target could also be used to test both unit
tests and integration tests at the same time.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: d53c8de06b
Component: cli
2017-08-31 10:32:00 -07:00
c7214e3099 Merge pull request #34656 from dnephin/move-testenv-to-internal
Move integration-cli/environment to an internal package
Upstream-commit: 184cea5ff710abde25547749e5608b24a255ba09
Component: engine
2017-08-31 08:52:24 -07:00
84f9eef358 remove fedora-24 build scripts because it is EOL
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: a84d468adb9c44c12c90e9358b54a5f089ee302f
Component: packaging
2017-08-30 20:07:33 -07:00