0fed403b92
Merge component 'cli' from git@github.com:docker/cli 18.09
2018-09-22 00:36:57 +00:00
0cc0272882
Merge pull request #1381 from dhiltgen/revamp_18.09
...
[18.09] `docker engine` updates
Upstream-commit: 19e1ab273e
2018-09-21 15:12:54 -07:00
1cc89a01f6
Merge component 'engine' from git@github.com:docker/engine 18.09
2018-09-21 21:04:06 +00:00
a7ed2532ff
Fix vendoring glitch
...
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: ec1812188f
2018-09-21 13:16:34 -07:00
4c429518af
Merge pull request #52 from thaJeztah/18.09_backport_fix-TestServiceWithDefaultAddressPoolInit
...
[18.09] backport TestServiceWithDefaultAddressPoolInit: avoid panic
Upstream-commit: ff9340ca2cc003d0829216524c6f96b98ce62f16
Component: engine
2018-09-21 11:19:57 -07:00
92a89516ee
Fix lint glitches
...
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 6004d74b1f
2018-09-21 11:01:17 -07:00
be44262dc3
Merge pull request #57 from AntaresS/cherry-37871
...
[18.09] backport fixing daemon won't start when "runtimes" option defined in both config file and cli
Upstream-commit: 90a90ae2e1fdb1f9782a51e41fe2b7dc80d48952
Component: engine
2018-09-21 09:54:31 -07:00
49c0046ea6
Merge component 'cli' from git@github.com:docker/cli 18.09
2018-09-21 12:37:00 +00:00
ae721f13eb
Merge pull request #1382 from thaJeztah/18.09_manifest-inspect-insecure-fix
...
[18.09] backport fix insecure manifest inspect with restrictive certs perms
Upstream-commit: e79e591ee9
2018-09-21 12:53:24 +02:00
f074e8a141
Remove metadata file before writing
...
The packages will deliver this as a link so lets make sure we don't
write through the link to the underlying packaged file.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 0f22d7e295
2018-09-20 18:00:46 -07:00
6a86f233f3
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09
2018-09-20 21:03:29 +00:00
e5e1355bb7
Review comments
...
Address code review comemnts and purge additional dead code.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: f250152bf4
2018-09-20 12:01:20 -07:00
04ec85f5b8
Merge pull request #226 from thaJeztah/18.09_more_updates_to_package_description
...
[18.09] more updates to package description
Upstream-commit: 43f81b5c522ea597c22a1e3e484fc911c865f7aa
Component: packaging
2018-09-20 11:54:50 -07:00
1e6a450e9c
Merge pull request #225 from thaJeztah/18.09_update_package_description
...
[18.09] backport update package description
Upstream-commit: 1cb8fe5bda7d7b92646e5ea859fc5ada832bb0b2
Component: packaging
2018-09-20 11:54:31 -07:00
feaf4f4d37
Merge pull request #230 from kolyshkin/18.09-fix-path
...
[18.09] systemd/docker.service: fix PATH
Upstream-commit: 1b2edd1ffda28df88692bb7faa16ac30f879c5b7
Component: packaging
2018-09-20 11:53:29 -07:00
e0ec331c69
Merge pull request #227 from thaJeztah/18.09_update_fedora_list
...
[18.09] backport Update outdated Fedora versions
Upstream-commit: 8751612797e77ddaa14674aeda1bffd5f85c27b7
Component: packaging
2018-09-20 11:45:24 -07:00
12e294aaf5
Merge pull request #229 from thaJeztah/18.09_revert_suffix
...
[18.09] revert "Specify suffix for DEB_VERSION"
Upstream-commit: ea3b15971e895c2a259bc2fca04f323a8e8a6fb6
Component: packaging
2018-09-20 11:45:02 -07:00
812694c0cc
fixed the dockerd won't start bug when 'runtimes' field is defined in both daemon config file and cli flags
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
(cherry picked from commit 8392d0930b511402aa7aa71ccfe6c0d4a8159237)
Upstream-commit: 66ed41aec82dbcdfbc38027e3d800e429af1cd58
Component: engine
2018-09-20 10:54:47 -07:00
622b5b7f2d
fix insecure manifest inspect with restrictive certs perms
...
If, for some reason, the certs directory has permissions that are
inaccessible by docker, we should still be able to fetch manifests using
the `insecure` flag.
Since the cli doesn't access the engine's list of insecure registries,
the registry client should make a singleton list of the registry being queried with the
`insecure` flag.
Closes #1358
Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com >
(cherry picked from commit d57adbc034github@gone.nl >
Upstream-commit: f9d666b057
2018-09-20 19:53:10 +02:00
49de0c314f
deb/systemd: remove
...
These files are not used, and having them in repo is misleading.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: fca673ad8051d1b377435821ec6c76c0de24b663
Component: packaging
2018-09-20 10:16:39 -07:00
be5df7c46b
systemd/docker.service: fix PATH
...
Set the PATH to what appears to be the standard on latest Ubuntu (18.04)
and Debian (9), fixing the following two issues:
1. PATH did not contain /bin (leading to ContainerTop/ps not working
on newer distros, among the other things).
2. $PATH can't be specified in Environment directives in .service files.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 62d9a0d1253049a2fab10f938542a8e09dd0804a
Component: packaging
2018-09-20 10:09:10 -07:00
76823a4d29
Revert "Specify suffix for DEB_VERSION"
...
This reverts commit 6c5b7fcb956871f7a44e1a478ad9450f9df4bed1.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 00104664c15a6025451ae766b77b78b347ee1ad3
Component: packaging
2018-09-20 16:06:01 +02:00
0ef2a783ef
Update outdated Fedora versions
...
(cherry picked from commit f0212649020ad5a1b0ca17c61ab500992ac981b4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5f5601309ac7c0814b077166aa3b101c8bfce6fe
Component: packaging
2018-09-20 13:04:16 +02:00
eb465533d3
more updates to package descriptions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: eb89f3ebd68033fe49b12016ad07f28cfc33d874
Component: packaging
2018-09-20 12:42:43 +02:00
4827d551d2
change some wording in package description
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 1a3379642fb37457d0249ae99385d17ddc85a6af)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 56bed5f33d75bf297c8f3c2018a34aaa30cfe9da
Component: packaging
2018-09-20 12:34:01 +02:00
1456fda3ec
change home page link for deb pkgs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit a4df8fe1f86f38ad935862eb188b6fc234d22793)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 702f6a07fccef45343368895d105bb3e79ad2339
Component: packaging
2018-09-20 12:33:54 +02:00
1a085c96aa
Refined engine implementations
...
Adapt the CLI to the host install model for 18.09.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 342afe44fb
2018-09-19 20:10:31 -07:00
2119c0b73f
Install binaries on host for upgrade
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: cfec8027ed
2018-09-19 19:06:28 -07:00
b1b0f9d898
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09
2018-09-19 01:03:01 +00:00
9cdb2818ff
Merge component 'engine' from git@github.com:docker/engine 18.09
2018-09-19 01:02:50 +00:00
bb0dd83bce
Merge pull request #220 from seemethere/configurable_1809
...
Merged with https://github.com/seemethere/unir
Upstream-commit: 24d48340b743436ebf90ef3b18522348d1fe3e16
Component: packaging
2018-09-19 00:01:01 +00:00
43b6de9f82
Merge pull request #50 from AntaresS/cherry-pick-moby
...
[18.09] backport propagate the dockerd cgroup-parent config to buildkitd
Upstream-commit: ea2e2c54272d906d527949c5635b95ac8e23b613
Component: engine
2018-09-18 16:36:12 -07:00
418dc58053
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09
2018-09-18 21:03:32 +00:00
33237214c7
Merge pull request #219 from seemethere/dynamic_compile_1809
...
[18.09] Dynamically compile the docker daemon
Upstream-commit: 48b843941c1d913e7a55054783ca7c7a29dbd7d9
Component: packaging
2018-09-18 13:44:37 -07:00
1b4f5d412e
Make base for Dockerfile.engine-dm configurable
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 605df1abcb4c432ebb1b73c29bfa0d5d3d48c0ce)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 7df6db6ac3b71c0a41fc2792e5778e2566b72399
Component: packaging
2018-09-18 13:34:12 -07:00
8647a399e2
Dynamically compile the docker daemon
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 4f18a1969510930b98b4ad4375297ea4db3298f3)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 5e9cc984546917e2129e7601e329d9ce085d1e7e
Component: packaging
2018-09-18 13:30:21 -07:00
97c18c02cb
create newBuildKit function separately in daemon_unix.go and daemon_windows.go for cross platform build
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
(cherry picked from commit 66ac92cdc65be350ec53f1de51052374846dfe24)
Upstream-commit: a5d731edecc75927f602c7f15e5ba9f5f77d3655
Component: engine
2018-09-18 11:19:51 -07:00
4a973bddb1
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09
2018-09-18 01:03:19 +00:00
f7b24aae90
Merge pull request #216 from seemethere/add_devicemapper_1809
...
[18.09] Add native rpm compilation for devicemapper
Upstream-commit: b7286dfc6457073f6988fbda86ea7e4ee0fd1ce6
Component: packaging
2018-09-18 02:40:00 +02:00
3c71b9d6ac
Add native rpm compilation for devicemapper
...
devicemapper cannot be enabled on a statically compiled binary so we
dynamically compile it on a rhel based distribution in order to enable
devicemapper usage.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 7cb8d358947974abae3e3c346b09523904030609)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: c80ac56dfa393c405c2cd33af94ad6ac1366ece2
Component: packaging
2018-09-17 16:50:09 -07:00
eda0ddc2a8
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09
2018-09-17 21:04:28 +00:00
e1e02bf4ba
Merge component 'engine' from git@github.com:docker/engine 18.09
2018-09-17 21:04:18 +00:00
39a15def6d
Merge pull request #55 from thaJeztah/18.09_backport_fix-progress-panic
...
[18.09] backport pkg/progress: work around closing closed channel panic
Upstream-commit: c24fd7a2c3e4381010f1039d6a4cfa35f635d074
Component: engine
2018-09-17 11:43:41 -07:00
7ed21517c2
Merge pull request #214 from seemethere/iptables_fix_1809
...
Merged with https://github.com/seemethere/unir
Upstream-commit: 6dada46805e14da118eca74052734f4caa35503f
Component: packaging
2018-09-17 17:24:00 +00:00
954ee90b32
Add /usr/sbin to our path variable for systemd
...
iptables is sometimes placed in `/usr/sbin`
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit c86a958d6d344d6bf568523c28d6643d7b49ba43)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 36a08784a0b7bc49487005d323bf4e41fd50d36d
Component: packaging
2018-09-17 10:20:34 -07:00
4ec08ba334
Merge component 'engine' from git@github.com:docker/engine 18.09
2018-09-17 13:02:03 +00:00
f59ff81d45
Merge pull request #53 from thaJeztah/18.09_backport_buildkit-cli-control
...
[18.09] backport always hornor client side to choose which builder to use with DOCKER_…
Upstream-commit: 5fb0a7ced7bcdb9e86e048fe3b24d0d4297d6155
Component: engine
2018-09-17 12:34:28 +02:00
27a6fe5146
pkg/progress: work around closing closed channel panic
...
I could not reproduce the panic in #37735 , so here's a bandaid.
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit 7dac70324d0ce6acd23458b0bef06f099837d648)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2c26eac56628527ed64c79ce9145ed97583cbeca
Component: engine
2018-09-17 12:28:09 +02:00
d3c8a2bd75
Merge pull request #558 from corbin-coleman/bump-version-18.09.0-beta1.3
...
[18.09] Bump VERSION to 18.09.0-beta1.3
2018-09-14 13:14:55 -07:00
48f8e34e5a
Bump VERSION to 18.09.0-beta1.3
...
Signed-off-by: corbin-coleman <corbin.coleman@docker.com >
2018-09-14 19:07:09 +00:00
