6f7a62be58
Merge pull request #990 from vdemeester/e2e-iddfile-from-moby
...
Import TestBuildIidFileSquash from moby to cli
Upstream-commit: ed335aba8c
2018-07-30 11:37:36 +02:00
d36e39d22c
Merge pull request #1237 from vdemeester/use-non-deprecated-filters-funcs
...
Migrate to non-deprecated functions of `api/types/filters`
Upstream-commit: edfd623594
2018-07-27 14:47:01 +00:00
e74e974112
Migrate to non-deprecated functions of api/types/filters
...
- Use `Contains` instead of `Include`
- Use `ToJSON` instead of `ToParam`
- Remove usage of `ParseFlag` as it is deprecated too
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 55edeb497a
2018-07-27 15:37:43 +02:00
5ff8cde8dc
Merge pull request #1140 from Vimal-Raghubir/1110-Fix-Warning-Message
...
Fix: Warning Message and Fallback search
Upstream-commit: a3464c0a20
2018-07-27 07:27:00 +00:00
e905f40a10
Merge pull request #1235 from vdemeester/compose-add-missing-field
...
Add missing fields in compose/types
Upstream-commit: b3b2ace735
2018-07-26 15:20:42 +00:00
ce042f6ff4
Add missing fields in compose/types
...
Even though those fields are not supported by `docker stack deploy`
they are defined in versions `3.x` of compose schema, so the `compose`
package should be able to marshal/unmarshal them.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d13e2df65b
2018-07-26 17:04:22 +02:00
c76e6866ad
Merge pull request #1232 from tommilligan/1231-zsh-autocomplete-update-invalid
...
Fixed typo breaking zsh docker update autocomplete (closes #1231 )
Upstream-commit: effe36a155
2018-07-25 14:17:57 +02:00
4c5f6c0dc0
Fixed typo breaking zsh docker update autocomplete
...
Signed-off-by: Tom Milligan <tommilligan@users.noreply.github.com >
Upstream-commit: da00d1c49f
2018-07-25 12:23:08 +01:00
9be707763d
Merge pull request #1227 from pszczekutowicz/master
...
Added events filter scope for bash and zsh completion
Upstream-commit: 601131634e
2018-07-22 22:33:25 +02:00
e1ab6a31da
Added events filter scope zsh completion
...
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com >
Upstream-commit: 13db1bc95f
2018-07-20 15:47:00 +02:00
e91cf840e6
Added events filter scope bash completion
...
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com >
Upstream-commit: c922ea2f45
2018-07-20 15:37:49 +02:00
957aa92a67
Merge pull request #1226 from thaJeztah/harder_better_slower_stronger
...
Bump version to 18.09.0-dev
Upstream-commit: 543d6fb8da
2018-07-20 10:30:41 +02:00
243d4a2f49
Bump version to 18.09.0-dev
...
Releases will be supported for a longer term, and
will be done on a 6-month(ish) cycle.
https://blog.docker.com/2018/07/extending-support-cycle-docker-community-edition/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7fba38acad
2018-07-20 10:14:32 +02:00
724ab95ba8
Merge pull request #1216 from justyntemme/patch-4
...
Update deploy.go
Upstream-commit: 48fbb12b7c
2018-07-17 16:20:46 +02:00
8dee127b92
Update deploy.go
...
Clarified ambiguous error message
Update kubernetes/cli.go
Infromed user of why the error was caused when file is not there
Signed-off-by: Justyn Temme <justyntemme@gmail.com >
Upstream-commit: bdd58a4096
2018-07-17 09:14:05 -05:00
1d3ba53158
Merge pull request #1019 from ktomk/fix-env-file
...
import environment variables that are present
Upstream-commit: 9e71207327
2018-07-16 13:41:29 +02:00
df467b49b6
Merge pull request #1192 from peter-kehl/master
...
For docker/docker.github.io/issues/6987
Upstream-commit: 7b82276c88
2018-07-16 12:22:02 +02:00
95d9ce4032
Merge pull request #1212 from thaJeztah/bump_circleci_docker
...
Update CircleCI Docker version to 18.03
Upstream-commit: b395d2d6f5
2018-07-13 15:13:40 +02:00
de770aa887
Fix: Warning Message
...
Signed-off-by: Vimal-Raghubir <vraghubir0418@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ce3d069936
2018-07-13 13:39:24 +02:00
3980327921
Configure CircleCI remote daemon to use version 18.03.1
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 13eb2aa125
2018-07-13 11:51:41 +02:00
15f7e30815
Merge pull request #1208 from thaJeztah/update-linting
...
Update gometalinter to v2.0.6, remove nakedret
Upstream-commit: d57cc1782e
2018-07-13 11:41:59 +02:00
92fa05c733
Update CircleCI Docker version to 18.03
...
17.06 has reached EOL a long time ago; let's use a current
version in CI as well :D
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e2a56c47da
2018-07-13 11:26:07 +02:00
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
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
2018-07-13 11:17:43 +02:00
0388cb645f
Merge pull request #1210 from albers/completion-service-create--init
...
Add bash completion for `service create|update --init`
Upstream-commit: d97f378009
2018-07-13 09:44:11 +02:00
526010074d
Add bash completion for service create|update --init
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 97d312e02a
2018-07-13 09:05:29 +02:00
370f51742e
Merge pull request #1204 from thaJeztah/improve-version-align
...
Improve version output alignment
Upstream-commit: ee8cdb3850
2018-07-12 10:53:50 +02:00
508c160462
Adapt min-column width to component information
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0f7ae34ea9
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
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
2018-07-10 01:31:32 +02:00
77f98deb03
Merge pull request #1196 from adshmh/use-sort-slice-for-sorting-cli-compose
...
refactored commands to use sort.Slice
Upstream-commit: b91953f507
2018-07-09 07:18:11 -07: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
2018-07-08 15:08:17 -04:00
1f2ee25258
Merge pull request #1194 from adshmh/use-sort-slice-for-sorting-output
...
use sort.Slice for sorting commands' output
Upstream-commit: 2b221d8f1c
2018-07-07 18:13:12 +02: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
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
2018-07-06 14:41:00 +02:00
abfc316457
Merge pull request #1166 from adshmh/add-sort-to-plugin-list
...
Sort plugin names in a natural order
Upstream-commit: 8160759013
2018-07-05 16:34:25 -07:00
ae87d856f8
For docker/docker.github.io/issues/6987
...
Signed-off-by: Peter Kehl <peter.kehl@gmail.com >
Upstream-commit: 249c8652a2
2018-07-05 14:12:47 -07: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
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
2018-07-05 00:33:13 +02:00
76a7769a26
Merge pull request #1163 from thaJeztah/bump_engine
...
bump docker and dependencies
Upstream-commit: f285fe67e9
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
2018-07-04 01:14:40 +00:00
a72fa5b176
Merge pull request #1186 from tiborvass/buildkit-envvar-zero
...
build: use strconv.ParseBool to parse DOCKER_BUILDKIT to allow value "0"
Upstream-commit: bded5beb78
2018-07-04 01:28:03 +02: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
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
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
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
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
2018-07-02 17:14:21 -07:00
58cb4233e4
Merge pull request #1175 from vdemeester/bump-k8s
...
Bump kubernetes dependencies to 1.8.14
Upstream-commit: f5393c904a
2018-07-02 17:12:35 +02:00
f3c0910062
Bump kubernetes dependencies to 1.8.14
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b59c41b2a7
2018-07-02 16:32:07 +02:00
13348b3c97
Merge pull request #1172 from vdemeester/no-need-to-check-files
...
Remove composefiles length check on k8s RunDeploy
Upstream-commit: 95a9b4d5fe
2018-07-02 15:06:50 +02:00
