Commit Graph

5247 Commits

Author SHA1 Message Date
ca353ee7ae Update hints for linting
- remove some hints that are no longer needed
- added a nolint: unparam for removeSingleSigner() (return bool is only used in tests)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9847e96765
Component: cli
2018-07-13 11:18:50 +02:00
71a73ab18c Update gometalinter to v2.0.6 and remove alexkohler/nakedret
alexkohler/nakedret is now installed by default with gometalinter,
so it's no longer needed to install this manually

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f3811e865e
Component: cli
2018-07-13 11:17:43 +02:00
526010074d Add bash completion for service create|update --init
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 97d312e02a
Component: cli
2018-07-13 09:05:29 +02:00
508c160462 Adapt min-column width to component information
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0f7ae34ea9
Component: cli
2018-07-12 01:34:34 +02:00
bc8e259b12 Extend version-align test with components
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 55ff66d967
Component: cli
2018-07-12 01:31:23 +02:00
d5d9154f1b Merge pull request #1178 from cyli/fix-swarm-ca-command
Propagate the provided external CA certificate to the external CA object in swarm
Upstream-commit: c8b9c21ef9
Component: cli
2018-07-10 01:31:32 +02:00
a160d8d6ac refactored cli/compose and cli/command/trust to use sort.Slice and removed custom types used for sorting
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 71d650ee17
Component: cli
2018-07-08 15:08:17 -04:00
b6e6c32f70 refactored all commands under cli/command/ to use sort.Slice instead of declaring custom types for sorting
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: ceed42217d
Component: cli
2018-07-06 15:49:32 -04:00
c81d2d67a0 Merge pull request #1102 from sfluor/1074-fix-mapping-a-range-of-host-ports-to-a-single-container-port
Fix mapping a range of host ports to a single container port
Upstream-commit: 2634562119
Component: cli
2018-07-06 14:41:00 +02:00
301034f108 The output of plugin list command is sorted by plugin name
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 26151d910a
Component: cli
2018-07-05 12:35:53 -04:00
9d7371b15c Adding support of the long syntax publish notation
Signed-off-by: Sami Tabet <salph.tabet@gmail.com>
Upstream-commit: 29612ccefe
Component: cli
2018-07-05 00:33:13 +02:00
76a7769a26 Merge pull request #1163 from thaJeztah/bump_engine
bump docker and dependencies
Upstream-commit: f285fe67e9
Component: cli
2018-07-04 16:17:12 +02:00
f9fb05a1c6 Bump docker and dependencies
Updates docker/docker to 1436dc8f8d0f6f60b6e335fbd918d6b22ee6574d,
matching 18.06.0-rc1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5f6d5c7328
Component: cli
2018-07-04 01:14:40 +00:00
8206a70295 build: use strconv.ParseBool to parse DOCKER_BUILDKIT to allow value "0"
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 721000e6c9
Component: cli
2018-07-03 23:14:06 +00:00
106b7430c8 Merge pull request #1176 from tiborvass/buildkit-iidfile
build: --iidfile support with buildkit
Upstream-commit: 7b255e653a
Component: cli
2018-07-03 15:36:23 -07:00
9a3e0745ac build: --iidfile support with buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c7e85c09d2
Component: cli
2018-07-03 19:11:11 +00:00
0f426dddd4 Merge pull request #1156 from dmcgowan/fix-manifest-list-size
Fix manifest lists to always use correct size
Upstream-commit: 69e1743e3d
Component: cli
2018-07-03 11:27:19 -07:00
86e2e9ef1f Propagate the provided external CA certificate to the external CA object
in swarm.

Also, fix some CLI command confusions:
1. If the --external-ca flag is provided, require a --ca-cert flag as well, otherwise
   the external CA is set but the CA certificate is actually rotated to an internal
   cert
2. If a --ca-cert flag is provided, require a --ca-key or --external-ca flag be
   provided as well, otherwise either the server will say that the request is
   invalid, or if there was previously an external CA corresponding to the cert, it
   will succeed.  While that works, it's better to require the user to explicitly
   set all the parameters of the new desired root CA.

This also changes the `swarm update` function to set the external CA's CACert field,
which while not strictly necessary, makes the CA list more explicit.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 4243440e1f
Component: cli
2018-07-02 17:14:21 -07:00
f3c0910062 Bump kubernetes dependencies to 1.8.14
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b59c41b2a7
Component: cli
2018-07-02 16:32:07 +02:00
779f6f7f88 Remove composefiles lenght check on k8s RunDeploy..
The compose file(s) are already loaded at that point.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 847e0c22d4
Component: cli
2018-07-02 15:00:19 +02:00
15af5c3d50 Fixing issue #1167 "Format example typo"
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: d0ddf91539
Component: cli
2018-07-02 14:21:10 +02:00
d6559c14df Merge pull request #1170 from vdemeester/omit-silvin
Add omitempty on compose config top-level types
Upstream-commit: 18091ea7e2
Component: cli
2018-07-02 14:16:53 +02:00
8d5faaab34 Add omitempty on compose config top-level types
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f05ab2b1fb
Component: cli
2018-07-02 12:04:09 +02:00
88306c7201 Merge pull request #1169 from silvin-lubecki/schema-vendoring
Add a doc.go file so the compose/schema/data directory can be vendore…
Upstream-commit: 981c099b96
Component: cli
2018-07-02 10:47:25 +02:00
f23d411358 Merge pull request #1168 from vdemeester/update-testing
Update TESTING.md to replace testify by gotest.tools
Upstream-commit: 1c69e83034
Component: cli
2018-07-02 10:34:28 +02:00
dbc964790c Add a doc.go file so the compose/schema/data directory can be vendored in another project, without being pruned.
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 3a8ef767f8
Component: cli
2018-07-02 10:08:25 +02:00
82ffaa807c Merge pull request #1160 from euank/simpler-pass
config/credentials: don't run 'pass' to detect it
Upstream-commit: 9e36ff4491
Component: cli
2018-07-02 09:40:47 +02:00
2d117d02fc Update TESTING.md to replace testify by gotest.tools
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 057bf6f4d1
Component: cli
2018-07-02 09:24:28 +02:00
449c60abf1 Merge pull request #1157 from AzureCR/master
Updated the go-winio library to release 0.4.8 that has the fix for Windows Container
Upstream-commit: 34ba66b0c5
Component: cli
2018-06-29 21:11:53 +02:00
a4509c02c7 config/credentials: don't run 'pass' to detect it
'CheckInitialized' in the credential-helper library actually invokes
`pass`, which isn't desirable (see #699).

This moves the check to be simpler, and then pass will only be invoked
when it's needed (such as for `docker login` or when pulling from a
private registry).

This logic could also reasonably live in the credential-helper library,
but it's simple enough it seems fine in either location.

Signed-off-by: Euan Kemp <euank@euank.com>
Upstream-commit: 056015c3d8
Component: cli
2018-06-29 11:38:39 -07:00
00a2e2286e Updated the go-winio library to release 0.4.8 that has the fix for Windows containers
Signed-off-by: Tejaswini Duggaraju <naduggar@microsoft.com>
Upstream-commit: c98c4080a3
Component: cli
2018-06-29 10:49:52 -07:00
871e21254e Merge pull request #1145 from Vimal-Raghubir/590-Add-missing-option
Add: Add missing option
Upstream-commit: da59ccb601
Component: cli
2018-06-29 17:16:25 +02:00
a60dc52c9f Merge pull request #1155 from adshmh/add-unit-tests-to-plugin-list
added unit tests to cover plugin list command
Upstream-commit: 9faf728089
Component: cli
2018-06-29 15:49:30 +02:00
f354e71da3 Merge pull request #1152 from vdemeester/extract-converter
Extract StackConverter from the StackClient
Upstream-commit: 7c7c299eee
Component: cli
2018-06-29 13:36:55 +02:00
74cbabea8f Merge pull request #1158 from albers/completion-dockerd--default-address-pool
Add bash completion for `dockerd --default-address-pool`
Upstream-commit: 3991b2fae3
Component: cli
2018-06-29 11:48:43 +02:00
312f1fe0aa Add bash completion for exec_die event
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8443982188
Component: cli
2018-06-29 11:20:23 +02:00
ee38cae4b8 Add bash completion for dockerd --default-address-pool
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0e6d9dfe85
Component: cli
2018-06-29 11:11:24 +02:00
b02499f190 Fix manifest lists to always use correct size
Stores complete OCI descriptor instead of digest and platform
fields. This includes the size which was getting lost by not
storing the original manifest bytes.

Attempt to support existing cached files, if not output
the filename with the incorrect content.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 1fd2d66df8
Component: cli
2018-06-28 18:17:38 -07:00
b31e4cd2ef added unit tests to cover plugin list command
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: c26121df5c
Component: cli
2018-06-28 16:51:54 -04:00
644d6fd60f Bump version to 18.07.0-dev
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f1fa1f3f15
Component: cli
2018-06-28 15:44:15 +02:00
4efabde589 Merge pull request #1151 from vdemeester/update-docker-credential-helper-pass
Update docker-credential-helpers dependency
Upstream-commit: 293553944d
Component: cli
2018-06-28 14:57:05 +02:00
539051208f Update docker-credential-helpers dependency
This is mainly for the `pass` helper ; `pass` shouldn't be called
every docker command anymore ;).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d9741fc96b
Component: cli
2018-06-28 14:44:53 +02:00
efa9f9914b added unit tests covering content trust for plugin install command
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: bc9b42ea9b
Component: cli
2018-06-27 22:16:19 -04:00
9152b94149 Extract StackConverter from the StackClient
It makes it easier to get the correct stack from a compose config
struct without requiring the client (and thus talking to k8s API)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f2e6ee6899
Component: cli
2018-06-27 16:41:00 +02:00
5be6ded435 Add: Add missing option
Signed-off-by: Vimal-Raghubir <vraghubir0418@gmail.com>
Upstream-commit: a205aecb80
Component: cli
2018-06-26 22:20:01 -04:00
d11d5a93ae Merge pull request #1128 from vdemeester/interpolation-options
Add options to the compose loader
Upstream-commit: 204ab4ca74
Component: cli
2018-06-26 15:05:54 +02:00
1821b4879d Refactor stack command/package
- Handle `bundlefile` directly in the `top-level`
  command. `bundlefile` is still experimental and will be deprecated
  in future version — this should make be easier to remove it.
- Validate the `stack` name in all cases (i.e. whatever the
  orchestrator is used)
- Load the composefile ahead of choosing the orchestrator. This
  removes some slight duplication.
- Makes `RunDeploy` easier to use from outside packages (like
  `docker/app`) with a preloaded configuration.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0f9d24f78d
Component: cli
2018-06-26 14:07:26 +02:00
e9bc5ab185 Add options to the compose loader
- Add the possibility to skip interpolation
- Add the possibility to skip schema validation
- Allow customizing the substitution function, to add special cases.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9fdd14f399
Component: cli
2018-06-25 17:15:26 +02:00
fad2548681 Merge pull request #1138 from seemethere/env_experimental
Add env variable option for experimental
Upstream-commit: 61e53fc88a
Component: cli
2018-06-25 14:47:16 +02:00
bd5f8ff9d8 Refactor tests
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 38056740d6
Component: cli
2018-06-25 11:13:32 +02:00