Commit Graph

5280 Commits

Author SHA1 Message Date
04c5e8c6df Allow running make help without out-of-container warning
Signed-off-by: Marco Vedovati <mvedovati@suse.com>
Upstream-commit: 265dec037b
Component: cli
2018-07-31 10:56:48 +02:00
a87b47f24d Merge pull request #1242 from cyphar/buildmode-pie
build: add -buildmode=pie
Upstream-commit: 40650cfbd5
Component: cli
2018-07-31 10:09:11 +02:00
7ff97deeb6 Exposes compose loader.Transform function…
This should make it easier for people to write custom composefile
parser without duplicating too much code. It takes the default
transformers and any additional number of transformer for any
types. That way it's possible to transform a `cli/compose` map into a
custom type that would use some of `cli/compose` types and its own.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0246bc1b3b
Component: cli
2018-07-31 09:37:09 +02:00
a013875ea3 Merge pull request #1230 from vdemeester/update-k8s-and-other-deps
Update k8s and other deps
Upstream-commit: b4e50635a2
Component: cli
2018-07-30 17:49:11 +02:00
499075c042 Merge pull request #1240 from thaJeztah/datapath_addr_api_annotation
Add API-version anotation for --data-path-addr
Upstream-commit: 19653e7fad
Component: cli
2018-07-30 17:47:52 +02:00
d5c619e6c1 Merge pull request #1222 from thaJeztah/its_not_standard_but_its_in
Update --compose-file flag description to mention stdin
Upstream-commit: 6cd0e2fe70
Component: cli
2018-07-30 16:23:29 +02:00
cb923e6307 Re-order vendor.conf alphabeticaly
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: fffec04374
Component: cli
2018-07-30 16:14:52 +02:00
6f7a62be58 Merge pull request #990 from vdemeester/e2e-iddfile-from-moby
Import TestBuildIidFileSquash from moby to cli
Upstream-commit: ed335aba8c
Component: cli
2018-07-30 11:37:36 +02:00
4a40f4d761 build: add -buildmode=pie
Make all dynbinary builds be position-independent (this adds both
security benefits and can help with flaky builds on POWER
architectures).

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: 164e812b7a
Component: cli
2018-07-30 19:34:01 +10:00
6ec35e4b2d Add API-version anotation for --data-path-addr
This flag was added in Docker 17.06, API version 1.31 through
moby@8dc8cd4719f165c01c98e7d3ce1d6cea6a8f60b8, but didn't add
API-version annotations.

This patch adds the missing annotations to hide this flag if
the CLI is connected to an older version of the daemon that
doesn't support that API.

Before this patch:

    DOCKER_API_VERSION=1.30 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

    DOCKER_API_VERSION=1.31 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

With this patch applied:

    DOCKER_API_VERSION=1.30 docker swarm init --help | grep data-path-addr
    # (no result)

    DOCKER_API_VERSION=1.31 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 91b1ad9d2b
Component: cli
2018-07-30 11:05:20 +02: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
Component: cli
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
Component: cli
2018-07-27 07:27:00 +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
Component: cli
2018-07-26 17:04:22 +02:00
e4c8ba34da Bump some dependencies to more recent versions (and tagged if available)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8788a4804f
Component: cli
2018-07-25 14:16:41 +02:00
4c5f6c0dc0 Fixed typo breaking zsh docker update autocomplete
Signed-off-by: Tom Milligan <tommilligan@users.noreply.github.com>
Upstream-commit: da00d1c49f
Component: cli
2018-07-25 12:23:08 +01:00
f83ff2718a Bump kubernetes dependencies to 1.11
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c8f0e211b9
Component: cli
2018-07-25 11:34:59 +02:00
e1ab6a31da Added events filter scope zsh completion
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com>
Upstream-commit: 13db1bc95f
Component: cli
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
Component: cli
2018-07-20 15:37:49 +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
Component: cli
2018-07-20 10:14:32 +02:00
08fd30fe8f Update --compose-file flag description to mention stdin
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2c7822b036
Component: cli
2018-07-19 14:55:48 +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
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
2018-07-13 11:51:41 +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
Component: cli
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
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
ae87d856f8 For docker/docker.github.io/issues/6987
Signed-off-by: Peter Kehl <peter.kehl@gmail.com>
Upstream-commit: 249c8652a2
Component: cli
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
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