Andrew Hsu
721a77818d
zero the version file in prep for nightly
...
Have the default version number not tied to next version number.
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2018-07-06 17:50:15 +00:00
GordonTheTurtle
23d14578b4
Merge component 'engine' from git@github.com:docker/engine master
2018-07-06 17:07:46 +00:00
GordonTheTurtle
136964a8f1
Merge component 'cli' from git@github.com:docker/cli master
2018-07-06 16:41:46 +00:00
Vincent Demeester
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
Vincent Demeester
c8c1e95dc9
Merge pull request #37394 from yongtang/07052018-ipcmode
...
Migrate some ipcmode tests to integration
Upstream-commit: aba2735e3fe66333ac1064bed3b476f30b1d1c00
Component: engine
2018-07-06 10:00:03 +02:00
Sebastiaan van Stijn
a960241d3c
Merge pull request #37399 from cyli/bump-swarmkit
...
Bump swarmkit to include task reaper fixes and more metrics.
Upstream-commit: 13f9a25a42b58c66edb2c6bae6f689ec24ede18c
Component: engine
2018-07-06 09:30:40 +02:00
GordonTheTurtle
ce46cc96e7
Merge component 'engine' from git@github.com:docker/engine master
2018-07-06 00:59:10 +00:00
GordonTheTurtle
31c1953e39
Merge component 'cli' from git@github.com:docker/cli master
2018-07-06 00:33:04 +00:00
Brian Goff
abfc316457
Merge pull request #1166 from adshmh/add-sort-to-plugin-list
...
Sort plugin names in a natural order
Upstream-commit: 8160759013
Component: cli
2018-07-05 16:34:25 -07:00
Ying Li
be1844eeef
Bump swarmkit to include task reaper fixes and more metrics.
...
This includes the following behavior-modifying PRs:
- docker/swarmkit#2673
- docker/swarmkit#2669
- docker/swarmkit#2675
- docker/swarmkit#2664
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: b322705750cddef903a1097e65a46a6a86610d0a
Component: engine
2018-07-05 15:24:10 -07:00
Sebastiaan van Stijn
ca577823d1
Merge pull request #37157 from debayande/even-more-names
...
Adds a few more names to the name generator.
Upstream-commit: 656036ce2cc949939e7eccc6d87d1e8be26e6890
Component: engine
2018-07-05 21:06:12 +02:00
Sebastiaan van Stijn
d053f8aaa0
Merge pull request #37378 from cpuguy83/fix_bindmount_src_create_race
...
Fix bindmount autocreate race
Upstream-commit: cfc75f91ab172f7a202494880c188c7fd963997b
Component: engine
2018-07-05 20:36:49 +02:00
Brian Goff
43a91b94e2
Merge pull request #37392 from thaJeztah/bump_fsnotify
...
update fsnotify to v1.4.7
Upstream-commit: e9c043517889accd19dd426d9f4aadaa18190896
Component: engine
2018-07-05 10:50:25 -07:00
GordonTheTurtle
33125af849
Merge component 'engine' from git@github.com:docker/engine master
2018-07-05 17:07:30 +00:00
GordonTheTurtle
06dc7cf0b2
Merge component 'cli' from git@github.com:docker/cli master
2018-07-05 16:41:46 +00:00
Arash Deshmeh
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
Vincent Demeester
aaa1925293
Merge pull request #37393 from mykeul/master
...
Added "--no-cache" to apk call to reduce alpine base image by 10-12% …
Upstream-commit: 06dee4cc27a1e5db75f2cdbcdcb7f762641b57d3
Component: engine
2018-07-05 15:06:21 +02:00
Sebastiaan van Stijn
7340763295
Merge pull request #37388 from ianre657/patch-1
...
add vim-plug setting
Upstream-commit: 65dce935a66de6894b9877b63ce2276eb681ba81
Component: engine
2018-07-05 14:50:28 +02:00
Sebastiaan van Stijn
cb25218045
Merge pull request #37380 from yui-knk/update_doc_Detect
...
Update documents of `Detect`
Upstream-commit: 8d56fa0bb780beb7b7116a8a17771179074408ea
Component: engine
2018-07-05 14:49:18 +02:00
Sami Tabet
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
Mickaël Remars
d5f0e16922
Replaced "--update-cache" argument with "--no-cache" in apk call to reduce alpine base image by 10-12% (avoid useless indexes in /var/cache/apk)
...
Signed-off-by: Mickaël Remars <github@remars.com >
Upstream-commit: e72047a37586f5a929aaec0b8c73863d7209904b
Component: engine
2018-07-04 23:34:30 +02:00
Yong Tang
bf53bc318d
Migrate some ipcmode tests to integration
...
This fix migrates some ipcmode tests in integration-cli
to integration tests.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e0403604e26868b1546a766ab0b40b6cb1677ee6
Component: engine
2018-07-04 16:32:18 +00:00
Sebastiaan van Stijn
086353aeec
update fsnotify to v1.4.7
...
Fixes a possible deadlock on closing the watcher on kqueue
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9f016c0fe1cd30381805fdb225854a36a806e961
Component: engine
2018-07-04 16:58:25 +02:00
Silvin
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
Ian Chen
a79f6da5b0
add vim-plug setting
...
this should work ( tried on my machine)
Signed-off-by: Ian Chen <ianre657@gmail.com >
Upstream-commit: a7652107189336f243e5c9a89b33a577df34fdd2
Component: engine
2018-07-04 15:54:19 +08:00
Sebastiaan van Stijn
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
Tibor Vass
6f30c64548
Merge pull request #37381 from tiborvass/api-platforms-as-string-for-temp
...
api: Change Platform field back to string (temporary workaround)
Upstream-commit: b711437bbd8596312c962d4189e9ad4d2108c2dc
Component: engine
2018-07-03 17:54:42 -07:00
Tibor Vass
32dfa10dbf
Merge pull request #37385 from tonistiigi/update-buildkit
...
vendor: update buildkit to 9acf51e491
Upstream-commit: 4b3df087a222fa34d771137b02348c51d9e107bc
Component: engine
2018-07-03 17:33:54 -07:00
GordonTheTurtle
6cd83dd22a
Merge component 'engine' from git@github.com:docker/engine master
2018-07-03 23:43:12 +00:00
Sebastiaan van Stijn
a72fa5b176
Merge pull request #1186 from tiborvass/buildkit-envvar-zero
...
build: use strconv.ParseBool to parse DOCKER_BUILDKIT to allow value "0"
Upstream-commit: bded5beb78
Component: cli
2018-07-04 01:28:03 +02:00
GordonTheTurtle
353f747d00
Merge component 'cli' from git@github.com:docker/cli master
2018-07-03 23:18:49 +00:00
Tibor Vass
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
Tibor Vass
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
Tibor Vass
6283fee6a2
api: Change Platform field back to string (temporary workaround)
...
This partially reverts https://github.com/moby/moby/pull/37350
Although specs.Platform is desirable in the API, there is more work
to be done on helper functions, namely containerd's platforms.Parse
that assumes the default platform of the Go runtime.
That prevents a client to use the recommended Parse function to
retrieve a specs.Platform object.
With this change, no parsing is expected from the client.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: facad557440a0c955beb615495b8d0175f25e4e3
Component: engine
2018-07-03 22:33:42 +00:00
Tonis Tiigi
acd7279a5e
vendor: update buildkit to 9acf51e491
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6144f50e553cf268a4d27cbe774a67b6ab283423
Component: engine
2018-07-03 15:22:39 -07:00
Sebastiaan van Stijn
1e9fc972c9
Merge pull request #37368 from tiborvass/buildkit-iidfile
...
builder: return image ID in API when using buildkit
Upstream-commit: 1da7d2eebf0a7a60ce585f89a05cebf7f631019c
Component: engine
2018-07-04 00:20:25 +02:00
Tonis Tiigi
642a920980
builder: do not send duplicate status for completed jobs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6f7dd9428e2134239467815c51aaab85756adb11
Component: engine
2018-07-03 14:47:38 -07:00
Tibor Vass
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
Tibor Vass
2a9011606f
builder: return image ID in API when using buildkit
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: ca8022ec63a9d0e2f9660e2a3455d821abf8f517
Component: engine
2018-07-03 19:11:02 +00:00
Tõnis Tiigi
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
Sebastiaan van Stijn
5f211d1a2a
Merge pull request #37242 from nvcastet/fix_sys_nice_seccomp
...
Whitelist syscalls linked to CAP_SYS_NICE in default seccomp profile
Upstream-commit: 6273dffbda8928327e8576dc58639edc09fd9c09
Component: engine
2018-07-03 19:23:07 +02:00
Sebastiaan van Stijn
ff4ddbf44b
Merge pull request #37371 from ctelfer/bump-libnw-430c00a
...
bump libnetwork to 430c00a
Upstream-commit: dca4cab55d501949b71c58cbd76452e6acfa9243
Component: engine
2018-07-03 19:09:41 +02:00
GordonTheTurtle
49fe8b5ca2
Merge component 'engine' from git@github.com:docker/engine master
2018-07-03 17:08:04 +00:00
Sebastiaan van Stijn
02405253ed
Merge pull request #37379 from yui-knk/fix_add_command_doc
...
Update documents of `dispatchAdd`
Upstream-commit: e54bbc0326608ee07c30062c24ebe7dc337407e1
Component: engine
2018-07-03 08:37:57 +02:00
Debayan De
065257683f
Adds a few more names to the name generator.
...
Signed-off-by: Debayan De <debayande@users.noreply.github.com >
Upstream-commit: 9d61eee75a3681fdff7f0c7e3232f4ccd3dfcaf6
Component: engine
2018-07-03 02:12:46 +01:00
Yuichiro Kaneko
b6f10654ea
Update documents of Detect
...
By 0296797f0f39477d675128c93c1646b3186937ee, `progressReader`
and `remoteURL` were removed from arguments. So developers who
use `Detect` not need to care about when `ProgressReaderFunc`
is used.
Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com >
Upstream-commit: 0bbd476ceb8da679f818df529cc917ec807a16af
Component: engine
2018-07-03 09:13:25 +09:00
Yuichiro Kaneko
bd47f635c0
Update documents of dispatchAdd
...
`ADD` does not support git.
Ref: https://github.com/moby/moby/issues/14704#issuecomment-298134333
Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com >
Upstream-commit: 9b374801ac843c3401bfb21d8fd5e205d0bba0d3
Component: engine
2018-07-03 08:51:07 +09:00
Brian Goff
b8a63a0fab
Fix bindmount autocreate race
...
When using the mounts API, bind mounts are not supposed to be
automatically created.
Before this patch there is a race condition between valiating that a
bind path exists and then actually setting up the bind mount where the
bind path may exist during validation but was removed during mountpooint
setup.
This adds a field to the mountpoint struct to ensure that binds created
over the mounts API are not accidentally created.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 1caeb79963d3c9f770b23be2f12c584adf49538d
Component: engine
2018-07-02 13:42:33 -07:00
GordonTheTurtle
874373ffa1
Merge component 'engine' from git@github.com:docker/engine master
2018-07-02 17:07:15 +00:00
GordonTheTurtle
98b57eb113
Merge component 'cli' from git@github.com:docker/cli master
2018-07-02 16:41:41 +00:00