Commit Graph
42626 Commits
Author SHA1 Message Date
GordonTheTurtle 75d17684b1 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-07 17:04:01 +00:00
Andrew Hsu c19e3d0b29 Merge pull request #128 from thaJeztah/18.09_backport_containerd_v1.2.1-GA
[18.09 backport] update just installer of containerd to 1.2.1
Upstream-commit: 6c633fbe18e0a69db3db1aed28b3fa23bc795dfe
Component: engine
2018-12-07 06:18:48 -08:00
Andrew Hsu 37a56d2599 update just installer of containerd to 1.2.1
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 1014b2bb66050a11bba833349346b35e6472688b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2c64d7c858b5fd16d0d14d692a3765cf8d5a5d7e
Component: engine
2018-12-07 11:20:22 +01:00
Andrew Hsu bca00687d8 Merge pull request #571 from andrewhsu/rc1
[18.09] bump ver 18.09.1-rc1 and update changelog
2018-12-06 18:12:05 -08:00
Andrew Hsu fe0ed1581f bump ver 18.09.1-rc1 and update changelog
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-12-06 23:45:38 +00:00
GordonTheTurtle 7bdb3c6b87 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-05 21:03:38 +00:00
Andrew Hsu 66c694875f Merge pull request #280 from thaJeztah/18.09_backport_remove_spec
[18.09 backport] Remove unused spec files
Upstream-commit: abbaa92613ec98ce92b7d868975f67bb1927d693
Component: packaging
2018-12-05 11:38:57 -08:00
Eli Uriegas 89559b9c3c Remove unused spec files
We don't use these spec files to actually build from anymore so we
should just go through and remove them.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit b98d7aad1e153c18da5b488afc40ba751f90cb36)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9d68fe72f3649fad5e3f902602c8ae9ab4a6abe5
Component: packaging
2018-12-05 15:12:29 +01:00
Eli Uriegas 74239bfbe1 Merge pull request #570 from andrewhsu/b2
[18.09] bump ver 18.09.1-beta2
2018-12-03 16:12:12 -08:00
GordonTheTurtle 24b031ea42 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-03 23:53:35 +00:00
GordonTheTurtle 64e00cdf94 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-03 23:53:23 +00:00
GordonTheTurtle 6d1bca6a6c Merge component 'cli' from git@github.com:docker/cli 18.09 2018-12-03 23:26:41 +00:00
Andrew Hsu 129720636e bump ver 18.09.1-beta2
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-12-03 23:26:14 +00:00
Andrew Hsu dce40a7ca6 Merge pull request #279 from andrewhsu/golang
[18.09] bump golang to 1.10.5
Upstream-commit: 47d440b14714e57f8cda9f042299db1d35b2b592
Component: packaging
2018-12-03 14:49:31 -08:00
Andrew Hsu 11442eb1e7 bump golang to 1.10.5
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit c658dc545952bf4728e0ef3ff281bfa8823d60cb)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: df92c55b0ceefb75736d5d1f31a13f8400534a8b
Component: packaging
2018-12-03 22:21:44 +00:00
Andrew Hsu 679c1150b8 Merge pull request #126 from thaJeztah/18.09_backport_mask_asound
[18.09 backport] Masked /proc/asound
Upstream-commit: 82a4418f57d5aa0d58c8bba630d701a918094c3b
Component: engine
2018-12-03 14:06:43 -08:00
Andrew Hsu 66abfda9b2 Merge pull request #1542 from thaJeztah/18.09_backport_completion_cli_experimental
[18.09 backport] Add bash completion for experimental CLI commands (manifest)
Upstream-commit: 12834eeff6
Component: cli
2018-12-03 13:34:56 -08:00
GordonTheTurtle 46a88fbe88 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-03 21:04:39 +00:00
docker-unir[bot] 5efaa09256 Merge pull request #276 from andrewhsu/sock
Merged with https://github.com/seemethere/unir
Upstream-commit: be8c06f8a7ebaec9e7d30663c82131e0e2ae1aac
Component: packaging
2018-12-03 19:45:33 +00:00
Eli Uriegas 9b0d684d7f Add docker.socket requirement for docker.service
Without this the docker.socket would not start by default when starting
the docker.service leading to failures to start.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 88885d18b1bb0ef91eab4ad3311773f9c40838b7)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 93f125a2602b7eb72128cbc16d9d35c9d92ed18a
Component: packaging
2018-12-03 19:42:41 +00:00
docker-unir[bot] ffd5999784 Merge pull request #260 from thaJeztah/18.09_remove_telemetry_remnants
Merged with https://github.com/seemethere/unir
Upstream-commit: 091c4453b8e294b0e10ea9fe24c784c2086719be
Component: packaging
2018-12-03 19:40:52 +00:00
Andrew Hsu d3184b7576 Merge pull request #569 from andrewhsu/b1
[18.09] bump ver 18.09.1-beta1
2018-11-30 14:53:27 -08:00
GordonTheTurtle c5d1399959 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-11-30 22:35:25 +00:00
Andrew Hsu 23a01f3126 bump ver 18.09.1-beta1
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-11-30 22:14:01 +00:00
GordonTheTurtle e04edd81d4 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-11-30 22:08:33 +00:00
Andrew Hsu be73976052 Merge pull request #1544 from thaJeztah/18.09_bump_go_to_1.10.5
[18.09] Bump Go to 1.10.5
Upstream-commit: bb46da9fba
Component: cli
2018-11-30 14:03:12 -08:00
Andrew Hsu 3948a779cf Merge pull request #123 from tonistiigi/1809-builder-net
[18.09] builder: set externalkey option for faster hook processing
Upstream-commit: e7a4385e240a1cfb1d795ed8d622c97f6c217585
Component: engine
2018-11-30 14:02:12 -08:00
Andrew Hsu 0e511427f5 Merge pull request #127 from thaJeztah/18.09_bump_go_to_1.10.5
[18.09] Bump Go to 1.10.5
Upstream-commit: 09251ef9ca78a74d9a86ddb32bb4ab399032c3ba
Component: engine
2018-11-30 13:59:38 -08:00
GordonTheTurtle 5c9b82e262 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-11-30 21:01:58 +00:00
Sebastiaan van Stijn 9ff11286df Bump Go to 1.10.5
go1.10.5 (released 2018/11/02) includes fixes to the go command, linker,
runtime and the database/sql package. See the milestone on the issue
tracker for details:

List of changes; https://github.com/golang/go/issues?q=milestone%3AGo1.10.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 871d24d3fc
Component: cli
2018-11-30 21:59:54 +01:00
Eli Uriegas 4fa2dbdf38 Merge pull request #274 from seemethere/1809_sockles
[18.09] Add socket activation for RHEL based distributions
Upstream-commit: d2f8b45e8edb15960219b1e9ee88a6eec376ac73
Component: packaging
2018-11-30 12:54:23 -08:00
Eli Uriegas 8293f65feb Add socket activation for RHEL based distributions
Removes the systemd drop-in unit file for socket activation and instead
prefers socket activation by default for both RHEL based and DEBIAN
based distributions.

Socket activation for RHEL based distributions was tested on CentOS 7 and Fedora 28.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 91c85cd38197b9d92d5b3e8a1b577d3178d73fcc)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6a7e302c260a2ff7e4d8b7a6d01249a09c140618
Component: packaging
2018-11-30 19:43:29 +00:00
Sebastiaan van Stijn 67db4a25e1 Bump Go to 1.10.5
go1.10.5 (released 2018/11/02) includes fixes to the go command, linker,
runtime and the database/sql package. See the milestone on the issue
tracker for details:

List of changes; https://github.com/golang/go/issues?q=milestone%3AGo1.10.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 00ad8e7c5730f3c50ae2e548b47d1340202f72b2
Component: engine
2018-11-30 20:43:05 +01:00
Jonathan A. Schweder b15b31936b Masked /proc/asound
@sw-pschmied originally post this in #38285

While looking through the Moby source code was found /proc/asound to be
shared with containers as read-only (as defined in
https://github.com/moby/moby/blob/master/oci/defaults.go#L128).

This can lead to two information leaks.

---

**Leak of media playback status of the host**

Steps to reproduce the issue:

 - Listen to music/Play a YouTube video/Do anything else that involves
sound output
 - Execute docker run --rm ubuntu:latest bash -c "sleep 7; cat
/proc/asound/card*/pcm*p/sub*/status | grep state | cut -d ' ' -f2 |
grep RUNNING || echo 'not running'"
 - See that the containerized process is able to check whether someone
on the host is playing music as it prints RUNNING
 - Stop the music output
 - Execute the command again (The sleep is delaying the output because
information regarding playback status isn't propagated instantly)
 - See that it outputs not running

**Describe the results you received:**

A containerized process is able to gather information on the playback
status of an audio device governed by the host. Therefore a process of a
container is able to check whether and what kind of user activity is
present on the host system. Also, this may indicate whether a container
runs on a desktop system or a server as media playback rarely happens on
server systems.

The description above is in regard to media playback - when examining
`/proc/asound/card*/pcm*c/sub*/status` (`pcm*c` instead of `pcm*p`) this
can also leak information regarding capturing sound, as in recording
audio or making calls on the host system.

Signed-off-by: Jonathan A. Schweder <jonathanschweder@gmail.com>

(cherry picked from commit 64e52ff3dbdb31adc0a9930b3ea74b04b0df8d86)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5fffdb32261145b1178f571e25fbd71572769d58
Component: engine
2018-11-30 14:57:51 +01:00
GordonTheTurtle 3fe8afdba7 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-11-30 09:04:38 +00:00
Andrew Hsu 498e20e77e Merge pull request #125 from thaJeztah/18.09_backport_busybox
[18.09 backport] Windows: Tie busybox to specific version
Upstream-commit: e32fc16daa20c087eae4e7d4b16a79725a430108
Component: engine
2018-11-29 22:46:29 -08:00
John Howard 613f303049 Windows:Tie busybox to version
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit 14c8b67e51a8340284dfd8919843ce9edd1e5c71)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9c93de59da8eaa0e0e0377578a33b465b9465bb2
Component: engine
2018-11-30 01:38:11 +01:00
GordonTheTurtle c2d6f2e82b Merge component 'cli' from git@github.com:docker/cli 18.09 2018-11-30 00:37:02 +00:00
Andrew Hsu da117f6859 Merge pull request #1540 from thaJeztah/18.09_backport_fix_flags_in_usage
[18.09 backport] Fix yamldocs outputing `[flags]` in usage output
Upstream-commit: 61a9096b8d
Component: cli
2018-11-29 13:26:27 -08:00
Tonis Tiigi 6709623942 builder: delete sandbox in a goroutine for performance
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit bcf1967dd0893b36c56c8c9b87c84246916484a1)
Upstream-commit: 73911117b30ba74c42177b0f002bb4e98f2473f9
Component: engine
2018-11-29 09:15:15 -08:00
Tonis Tiigi 71605fc317 builder: set externalkey option for faster hook processing
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 1ad272c7e409476fd50fc701d45329b1e05bdec9)
Upstream-commit: 8fe3b4d2ec06720fedfce2c2ef1b4fd7940961a6
Component: engine
2018-11-29 09:15:00 -08:00
Harald Albers 280488aa00 Add bash completion for manifest command family
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 0fb4256a00)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2ac475cf97
Component: cli
2018-11-29 17:15:06 +01:00
Harald Albers 42fbd93961 Add support for experimental cli features to bash completion
This is needed for implementing bash completion for the `docker manifest`
command family.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit a183c952c6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2a36695037
Component: cli
2018-11-29 17:15:04 +01:00
Harald Albers 13b7f9fef8 Refactor usage of docker version in bash completion
This preapares bash completion for more context sensitivity:

- experimental cli features
- orchestrator specific features

Also renames _daemon_ to _server_ where used in context of `docker version`
because the fields there are grouped unter _Server_.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 564d4da06e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dc74fc81f2
Component: cli
2018-11-29 17:15:02 +01:00
Sebastiaan van Stijn 5cd594924c Fix yamldocs outputing [flags] in usage output
A similar change was made in the CLI itself, but is not
inherited by the code that generates the YAML docs.

Before this patch is applied;

```
usage: docker container exec [OPTIONS] CONTAINER COMMAND [ARG...] [flags]
```

With this patch applied:

```
usage: docker container exec [OPTIONS] CONTAINER COMMAND [ARG...]
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 44d96e9120)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7e90635652
Component: cli
2018-11-29 15:44:16 +01:00
GordonTheTurtle 8273d9a9de Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-11-28 21:03:32 +00:00
Eli Uriegas b766ec9947 Merge pull request #269 from thaJeztah/18.09_backport_dont_require_containerd
[18.09 backport] Remove containerd dependency from CLI
Upstream-commit: ad65acf1a609e92019c961538c4d7c1b43eaf77c
Component: packaging
2018-11-28 12:34:11 -06:00
Eli Uriegas c9bd8ec5c6 Merge pull request #263 from thaJeztah/18.09_backport_compat
[18.09 backport] Change replaces/breaks to have compat with nightly
Upstream-commit: 1a683520a4590f9a92a231f8c3ee8841dff265f3
Component: packaging
2018-11-28 12:20:39 -06:00
Sebastiaan van Stijn 9c47bb0899 Remove containerd dependency from CLI
The RPM packages list containerd as a hard dependency. While
having containerd installed allows certain features (e.g., allow
you to run `docker engine activate`), this should not be a requirement
for installing the Docker CLI, as it limits the use of this package
for situations where the CLI is installed to connect to a remote
daemon.

This patch removes the containerd dependency from the RPM packages
(the deb packages don't have this dependency, so no change is needed
in those packages)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 037349c5dc3f18d3bea3be0217e249f716a8be25)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: bc3867a8f6e59c56c967720c33c6ce9a65b64b7b
Component: packaging
2018-11-28 18:19:44 +00:00
Eli Uriegas 74513be78c Merge pull request #267 from thaJeztah/18.09_restore_requires
[18.09] Add back requirements that were removed in the migration
Upstream-commit: 12dff4169636676f40f782d1327c24e8ccb18f7c
Component: packaging
2018-11-28 12:15:16 -06:00