Commit Graph
41178 Commits
Author SHA1 Message Date
GordonTheTurtle 57b10679e6 Merge component 'engine' from git@github.com:docker/engine master 2018-06-06 17:06:45 +00:00
GordonTheTurtle 5f7ac51e1c Merge component 'cli' from git@github.com:docker/cli master 2018-06-06 16:41:36 +00:00
Sebastiaan van Stijn f6411898cc Merge pull request #36895 from dmcgowan/vendor-containerd-master
Update containerd to 1.1
Upstream-commit: fd2f2a919e392b96de74795ae9af2dc5e510bc4c
Component: engine
2018-06-05 21:43:31 -07:00
Andrew Hsu 370137f15d Merge pull request #531 from seemethere/engine
Change engine component to point to docker/engine
2018-06-05 14:52:24 -07:00
Sebastiaan van Stijn 8925778ea9 Merge pull request #37211 from vdemeester/fix-volume-unit-test
Fix wrong assertion in volume/service package
Upstream-commit: 340fd5e2370714f54ae99b8679a4311617848bc5
Component: engine
2018-06-05 13:14:13 -07:00
Eli Uriegas 6e77b5d7c2 Change to docker/engine
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2018-06-05 19:02:54 +00:00
Vincent Demeester 50be59326e Fix wrong assertion in volume/service package
This last assertion shouldn't be there, those cases should be handled
by the for/switch above.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 04207c2db9cd82e47aa82bc2834fe3820086a697
Component: engine
2018-06-05 18:51:17 +02:00
Sebastiaan van Stijn 61e3e1ddea Merge pull request #1104 from vdemeester/show-me-your-secret
Add more example to the full-example tests
Upstream-commit: 90f8ce8a5d
Component: cli
2018-06-05 16:44:06 +02:00
Sebastiaan van Stijn 2452577cb1 Merge pull request #37194 from AntaresS/fix-test-failure
fix a failed test
Upstream-commit: ca25df3b54300e897d96029dcc4f86b8c4215a27
Component: engine
2018-06-05 02:38:04 +02:00
Sebastiaan van Stijn 0e7017a3ae Merge pull request #36688 from cpuguy83/volumes_service
Extract volume interaction to a volumes service
Upstream-commit: 5037c5a8ce762b46638378b7a7d1081572eadba1
Component: engine
2018-06-05 02:16:20 +02:00
Derek McGowan 77116c8094 Update containerd daemon
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: a0009345f51d7a58a2f188d7ffc7e0e837a5238d
Component: engine
2018-06-04 15:37:03 -07:00
Derek McGowan 60c800804e Update containerd to 1.1
Updates swarmkit, grpc, and all related vendors

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 52ed3e0896c203013388a3eb603658f345a9d80a
Component: engine
2018-06-04 15:37:03 -07:00
Sebastiaan van Stijn 94cab3b97b Merge pull request #37191 from adshmh/use-unique-names-for-integration-tests-secret
use unique names for resources in integration tests of secret package
Upstream-commit: d7e94d6ea7c1a76c79b6da722491c79118236999
Component: engine
2018-06-05 00:06:50 +02:00
Anda Xu 82d56e0c15 fix a failed test
Signed-off-by: Anda Xu <anda.xu@docker.com>
Upstream-commit: 1d9973c0d4c51362e8c5b38e585a025c90baf085
Component: engine
2018-06-04 14:29:00 -07:00
GordonTheTurtle 78419943dd Merge component 'engine' from git@github.com:moby/moby master 2018-06-04 17:09:05 +00:00
GordonTheTurtle 389df6fca3 Merge component 'cli' from git@github.com:docker/cli master 2018-06-04 16:42:00 +00:00
Vincent Demeester f5f666914b Merge pull request #37197 from tonistiigi/vendor-buildkit
vendor: dockerfile parser from buildkit
Upstream-commit: e466f999aa9d2add9ccaca655f8d53c3112c121d
Component: engine
2018-06-04 14:53:22 +02:00
Vincent Demeester 9bf4d4a535 Merge pull request #948 from simonferquel/k8s-watch-stack-status
K8s: more robust stack error detection on deploy
Upstream-commit: eaa9149e29
Component: cli
2018-06-04 10:42:42 +02:00
GordonTheTurtle 1023e99d13 Merge component 'engine' from git@github.com:moby/moby master 2018-06-03 17:07:57 +00:00
Akihiro Suda 79ad4e84bf Merge pull request #37190 from vdemeester/allow-make-run-with-args
Allow to add any args when doing a make run
Upstream-commit: 641e2c01cca0c9c66b173a52c1f1ef12a934dfa9
Component: engine
2018-06-03 03:42:02 +09:00
Tonis Tiigi f01f23683f vendor: add new opentracing deps for session tracing
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ad77dee8baafc478baa18f65a4972ba19b6e973f
Component: engine
2018-06-02 11:10:38 -07:00
Tonis Tiigi 2f23577c7a vendor: use dockerfile parser from buildkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: c9ebd2f13b3aab49c2d90cc38dcf2cd0d059697f
Component: engine
2018-06-02 11:10:34 -07:00
GordonTheTurtle 0132060680 Merge component 'cli' from git@github.com:docker/cli master 2018-06-02 16:41:34 +00:00
Sebastiaan van Stijn d9ce9238d8 Merge pull request #1106 from silvin-lubecki/fix-orchestrator-flag-persistent
Add a "top-level" annotation to hide persistent flags
Upstream-commit: 2014e991ee
Component: cli
2018-06-01 23:32:40 +02:00
GordonTheTurtle 763340472e Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-06-01 21:14:02 +00:00
Vincent Demeester 0e64c4ed59 Merge pull request #1105 from vdemeester/1044-compress-stream-friend
Fix panics when --compress and --stream are used together
Upstream-commit: d1cc8c731e
Component: cli
2018-06-01 23:00:01 +02:00
Andrew Hsu 894a729113 Merge pull request #113 from seemethere/btrfs
Remove btrfs-progs in favor of libbtrfs-dev
Upstream-commit: f1e7523cee9a53295233ba3d0e1fc5cb07ed7913
Component: packaging
2018-06-01 13:44:44 -07:00
Eli Uriegas 46248afb01 Remove btrfs-progs in favor of libbtrfs-dev
`btrfs-progs` doesn't actually contain the files we need, since we only
need the headers for btrfs, which `libbtrfs-dev` now provides.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 73678285d0671e1b67ec30d21e99cfe1580159fa
Component: packaging
2018-06-01 20:33:59 +00:00
Vincent Demeester de438df3a8 Allow to add any args when doing a make run
`make DOCKERD_ARGS=--init binary run` should start the daemon with
`--init` as flags (with any other "automagically" added ones).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d2af0d96e3fbdfec340cb707b795b863411b00e1
Component: engine
2018-06-01 19:19:20 +02:00
GordonTheTurtle 739469a67f Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-06-01 17:05:00 +00:00
GordonTheTurtle a7f733dcd3 Merge component 'cli' from git@github.com:docker/cli master 2018-06-01 16:41:21 +00:00
Vincent Demeester a87a3769f8 Fix panics when --compress and --stream are used together
Warns that `-compress` has no effect when used together with the
expremintal `--stream` flag.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8b3dc39fce
Component: cli
2018-06-01 18:34:00 +02:00
Vincent Demeester d1ccf01fd1 Merge pull request #1101 from silvin-lubecki/filter-stack-service
Fix service filtering by name on Kubernetes
Upstream-commit: 7db15a4553
Component: cli
2018-06-01 15:50:34 +02:00
Vincent Demeester 6f7cfb3c58 Merge pull request #1094 from thaJeztah/hide_checkpoint_on_windows
Hide experimental checkpoint features on Windows
Upstream-commit: 63ad0a0e88
Component: cli
2018-06-01 15:49:51 +02:00
Sebastiaan van Stijn 2d6b52f5ec Merge pull request #1097 from vdemeester/x-objects
Allow `x-*` extension on 3rd level objects
Upstream-commit: eb54d3e5c0
Component: cli
2018-06-01 15:48:04 +02:00
Silvin Lubecki 14b4abdabd Fix service filtering by name on Kubernetes to mimic Swarm filtering
*  Kubernetes native filtering (server side) is an exact match, now filtering on name is made client-side to add prefix-matching

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: b1ff199167
Component: cli
2018-06-01 15:43:02 +02:00
Silvin Lubecki cc8e8442e8 Added a "top-level" annotation to hide persistent flags in all sub-commands, excepting some specific commands, while printing help
Fixes issue #1099

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: c003ed1f35
Component: cli
2018-06-01 15:13:40 +02:00
Vincent Demeester fd04115881 Add more example to the full-example tests
Configs and Secrets were note present, some labels on volumes and
networks too.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 55426d9396
Component: cli
2018-06-01 14:16:18 +02:00
Arash Deshmeh 37acacf605 use unique names for resources in integration tests of integration/secret package
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: a70794aff0fc5a02db9c939397d663f174d2f726
Component: engine
2018-06-01 06:46:52 -04:00
Sebastiaan van Stijn a76ed6f917 YAML docs: add os_type property on flags and (sub)commands
This patch adds an `os_type` property in the generated YAML docs, both for
commands, and for flags;

Note that the ostype annotation on flags can have multiple values set,
however, multiple values are currently not used (and unlikely will).

To simplify usage of the os_type property in the YAML, and for consistency with
the same property for commands, we're only using the first ostype that's set.

```yaml
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 [flags]
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
  experimentalcli: false
  kubernetes: false
  swarm: false
- option: leave-running
  value_type: bool
  default_value: "false"
  description: Leave the container running after checkpoint
  deprecated: false
  experimental: false
  experimentalcli: false
  kubernetes: false
  swarm: false
deprecated: false
min_api_version: "1.25"
experimental: true
experimentalcli: false
kubernetes: false
swarm: false
os_type: windows
```

```yaml
command: docker container start
short: Start one or more stopped containers
long: Start one or more stopped containers
usage: docker container start [OPTIONS] CONTAINER [CONTAINER...] [flags]
pname: docker container
plink: docker_container.yaml
options:
- option: attach
  shorthand: a
  value_type: bool
  default_value: "false"
  description: Attach STDOUT/STDERR and forward signals
  deprecated: false
  experimental: false
  experimentalcli: false
  kubernetes: false
  swarm: false
- option: checkpoint
  value_type: string
  description: Restore from this checkpoint
  deprecated: false
  experimental: true
  experimentalcli: false
  kubernetes: false
  swarm: false
  os_type: linux
- option: checkpoint-dir
  value_type: string
  description: Use a custom checkpoint storage directory
  deprecated: false
  experimental: true
  experimentalcli: false
  kubernetes: false
  swarm: false
  os_type: linux
- option: detach-keys
  value_type: string
  description: Override the key sequence for detaching a container
  deprecated: false
  experimental: false
  experimentalcli: false
  kubernetes: false
  swarm: false
- option: interactive
  shorthand: i
  value_type: bool
  default_value: "false"
  description: Attach container's STDIN
  deprecated: false
  experimental: false
  experimentalcli: false
  kubernetes: false
  swarm: false
deprecated: false
experimental: false
experimentalcli: false
kubernetes: false
swarm: false
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: be035a0272
Component: cli
2018-05-31 22:31:31 +02:00
Andrew Hsu 87e0938121 Merge pull request #112 from seemethere/progs
btrfs-tools -> btrfs-progs
Upstream-commit: 7df78c90c9ff96e853f5cd07f7ba0d9c69a55e87
Component: packaging
2018-05-31 13:31:23 -07:00
Sebastiaan van Stijn ee64293c17 Mark checkpoint feature as Linux-only, and homogenize error messages
This patch adds annotations to mark the checkpoint commands as Linux only, which
hides them if the daemon is running a non-matching operating-system type;

Before:

    docker

    Usage:	docker COMMAND

    A self-sufficient runtime for containers

    ...

    Management Commands:
      config      Manage Docker configs
      container   Manage containers
      image       Manage images

After:

    docker

    Usage:	docker COMMAND

    A self-sufficient runtime for containers

    ...

    Management Commands:
      checkpoint  Manage checkpoints
      config      Manage Docker configs
      container   Manage containers
      image       Manage images

This change also prints errors when attempting to use checkpoint commands or
flags if the feature is not supported by the Daemon's operating system;

    $ docker checkpoint --help
    docker checkpoint is only supported on a Docker daemon running on linux, but the Docker daemon is running on windows

    $ docker checkpoint create --help
    docker checkpoint create is only supported on a Docker daemon running on linux, but the Docker daemon is running on windows

    $ docker checkpoint ls --help
    docker checkpoint ls is only supported on a Docker daemon running on linux, but the Docker daemon is running on windows

    $ docker checkpoint rm --help
    docker checkpoint rm is only supported on a Docker daemon running on linux, but the Docker daemon is running on windows

    $ docker container start --checkpoint=foo mycontainer
    "--checkpoint" requires the Docker daemon to run on linux, but the Docker daemon is running on windows

    $ docker container start --checkpoint-dir=/foo/bar mycontainer
    "--checkpoint-dir" requires the Docker daemon to run on linux, but the Docker daemon is running on windows

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1df6b68111
Component: cli
2018-05-31 22:25:06 +02:00
GordonTheTurtle 5044d62602 Merge component 'engine' from git@github.com:moby/moby master 2018-05-31 17:06:35 +00:00
GordonTheTurtle eeb2fb82e0 Merge component 'cli' from git@github.com:docker/cli master 2018-05-31 16:41:34 +00:00
Anusha Ragunathan d2c390cca0 Merge pull request #37177 from cpuguy83/minor_plugin_addr_change
Move plugin client to separate interface
Upstream-commit: 71cd53e4a197b303c6ba086bd584ffd67a884281
Component: engine
2018-05-31 08:22:04 -07:00
Silvin 8aa78bcb5c Merge pull request #1096 from thaJeztah/easier_testing_docker_version
Add test for version output aligning
Upstream-commit: 31d99ba630
Component: cli
2018-05-31 14:55:12 +02:00
Vincent Demeester 0e3e1012ac Allow x-* extension on 3rd level objects
As for top-level key, any 3rd-level key which starts with `x-` will be
ignored by compose. This allows for users to:
* include additional metadata in their compose files
* create YAML anchor objects that can be re-used in other parts of the config

This matches a similar feature in the swagger spec definition:
https://swagger.io/specification/#specificationExtensions

This means a composefile like the following is valid

```
verison: "3.7"
services:
  foo:
    image: foo/bar
    x-foo: bar
network:
  bar:
    x-bar: baz
```

It concerns services, volumes, networks, configs and secrets.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6bcfa8806c
Component: cli
2018-05-31 13:38:58 +02:00
Sebastiaan van Stijn 2f36c5552c Add test for version output aligning
Includes some refactoring to allow testing the output
in isolation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bb71808605
Component: cli
2018-05-31 10:15:15 +02:00
Vincent Demeester 6aff3ef24e Merge pull request #37174 from thaJeztah/no_additional_magic_matching
Be explicit about github.com prefix being a legacy feature
Upstream-commit: 2ea4ece674e04c04174ee9fff8005cdccdc4fad0
Component: engine
2018-05-31 09:45:59 +02:00
Vincent Demeester 065fbace32 Merge pull request #37178 from tonistiigi/layer-leak
builder: fix layer leak on multi-stage wildcard copy
Upstream-commit: 3e494c4b934b7fc3756d91b6e8117c9e4d7c28f1
Component: engine
2018-05-31 09:39:28 +02:00