Commit Graph
42605 Commits
Author SHA1 Message Date
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
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
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
Andrew Hsu 1355f268ee Merge pull request #266 from thaJeztah/18.09_add_seccomp_dependency
[18.09] Add libseccomp requirement for rpm packages
Upstream-commit: 9a7acfb9942edb67ce429f6d78c228036b0d465f
Component: packaging
2018-11-28 10:00:52 -08:00
Sebastiaan van Stijn 60a25b4d26 Add back requirements that were removed in the migration
During the migration to "image based builds", some dependencies
were removed.

This patch brings back those dependencies.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a6ff66f1a51af62c9fd17a8b931f8a9b0283247a
Component: packaging
2018-11-28 15:44:43 +01:00
Sebastiaan van Stijn 85e1aa53ce Add libseccomp requirement for rpm packages
This requirement was originally added in 86f76496ce33bd6eff1737348bc44add4723ddd2,
but got removed in the migration to the new image-based packaging.

Commit f2ceca98823548e401c6cca125b7057df28c4892 added this requirement
back for `.deb` packages, but did not include the same changes for
RPMs.

This patch adds back the requirement for RPM packages as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 86ed6eb2cef4e7386979fc73397c1844531eb3a9
Component: packaging
2018-11-28 15:28:34 +01:00
Eli Uriegas 99e4130444 Change replaces/breaks to have compat with nightly
Nightly builds wouldn't install correctly since our versioning scheme
for nightly builds is 0.0.0~ and 0 < 18.

Should be backwards compatible with 18.09 builds so there's no need to
actually backport this to 18.09.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit de312224beff9c6bc7fd6def46459d531cf2ce4a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3e383bee967aa07d35ea717544bc18aafbbad4f7
Component: packaging
2018-11-28 13:54:25 +01:00
Sebastiaan van Stijn b8014b87d1 Remove remnants from telemetry plugin from Fedora 27, 28
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d91edcf9ae07433110c62ddfbcdb7566fb285a81)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f7b95cb416685d86541f62440927a6613af3cb25
Component: packaging
2018-11-28 13:35:39 +01:00
GordonTheTurtle 3b44842574 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-11-27 21:00:40 +00:00
GordonTheTurtle d8014103b9 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-11-27 20:36:45 +00:00
Andrew Hsu 7e016c5a84 Merge pull request #81 from thaJeztah/18.09_backport_processandiot
[18.09 backport] Windows:Allow process isolation
Upstream-commit: a1f6b04a8d373dbed6262f076d9aac834031d24a
Component: engine
2018-11-27 09:58:22 -08:00
Andrew Hsu 06d25f9c17 Merge pull request #85 from thaJeztah/18.09_backport_deprecated_storagedrivers
[18.09 backport] deprecate legacy "overlay", and "devicemapper" storage drivers 
Upstream-commit: 7a566c0e4a98ec9960b5312e806ab546203dff15
Component: engine
2018-11-27 09:57:46 -08:00
Andrew Hsu 2eb0feaf2d Merge pull request #107 from thaJeztah/18.09_backport_bump_libnetwork
[18.09 backport] update libnetwork to fix iptables compatibility on debian
Upstream-commit: 61a250fd23db8cee48403e3d9de5de100470bd03
Component: engine
2018-11-27 09:55:12 -08:00
Andrew Hsu ed2630b559 Merge pull request #110 from thaJeztah/18.09_backport_handle_invalid_json
[18.09 backport] API: properly handle invalid JSON to return a 400 status
Upstream-commit: 8f18feabeb9ef7fe670ff6f1ecbba2a6460e0267
Component: engine
2018-11-27 09:51:54 -08:00
Andrew Hsu 1e216e2ec4 Merge pull request #112 from thaJeztah/18.09_backport_moby_37747
[18.09 backport] awslogs: account for UTF-8 normalization in limits
Upstream-commit: 08a77f11a63b2d25c00ca0e35012194bdcfbe917
Component: engine
2018-11-27 09:48:39 -08:00
Andrew Hsu bf3a1002a3 Merge pull request #113 from thaJeztah/18.09_backport_detach
[18.09 backport] Windows: DetachVhd attempt in cleanup
Upstream-commit: 4fd103ae26fc7784e79ed40f4e500e96477e14d2
Component: engine
2018-11-27 09:47:07 -08:00
Andrew Hsu 4d5ef4f441 Merge pull request #114 from thaJeztah/18.09_backport_limit_client_readall
[18.09 backport] client: use io.LimitedReader for reading HTTP error
Upstream-commit: 52a6fc02b1caa947aac807cdca807444d96c2e27
Component: engine
2018-11-27 09:44:42 -08:00
Andrew Hsu 62511b1be7 Merge pull request #116 from thaJeztah/18.09_backport_apparmor_external_templates
[18.09 backport] apparmor: allow receiving of signals from 'docker kill'
Upstream-commit: 12b8ec42b6ac60188ac48137677ee69ce98a3822
Component: engine
2018-11-27 09:41:37 -08:00
Andrew Hsu 4dfe418aab Merge pull request #118 from thaJeztah/18.09_backport_fence_default_addr_pools
[18.09 backport] Ignore default address-pools on API < 1.39
Upstream-commit: 23122e4d52258b72fde031284a1d53f941e6426c
Component: engine
2018-11-27 09:38:39 -08:00
Andrew Hsu 34a9d0e6de Merge pull request #119 from thaJeztah/18.09_backport_fix_default_addr_pools_swagger
[18.09 backport] Add missing default address pool fields to swagger
Upstream-commit: 04a6b49a896470420dd460b6ce027cac41791c04
Component: engine
2018-11-27 09:36:52 -08:00
Andrew Hsu cbd6c39e45 Merge pull request #120 from thaJeztah/18.09_backport_check_for_more_ipvs_options
[18.09 backport] Add CONFIG_IP_VS_PROTO_TCP, CONFIG_IP_VS_PROTO_UDP, IP_NF_TARGET_REDIRECT to check-config.sh
Upstream-commit: c488cf7e95b14d5d769a06f72f72fb899800683c
Component: engine
2018-11-27 09:35:55 -08:00
Andrew Hsu 6947813afd Merge pull request #1454 from thaJeztah/18.09_backport_defaulttcpschema
[18.09 backport] fixes #1441 set default schema to tcp for docker host
Upstream-commit: 3f7989903a
Component: cli
2018-11-27 09:32:51 -08:00
Andrew Hsu f10a3615ef Merge pull request #121 from thaJeztah/18.09_backport_containerd_v1.2.1
[18.09 backport] Update containerd to v1.2.1-rc.0
Upstream-commit: c95cf2a5d36b5448e4771a29f2ad72214a2311dd
Component: engine
2018-11-27 09:15:48 -08:00
GordonTheTurtle 09cf4efc43 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-11-27 01:01:00 +00:00