Commit Graph

41548 Commits

Author SHA1 Message Date
6905b9b449 Merge component 'cli' from git@github.com:docker/cli master 2018-07-07 17:47:00 +00:00
1f2ee25258 Merge pull request #1194 from adshmh/use-sort-slice-for-sorting-output
use sort.Slice for sorting commands' output
Upstream-commit: 2b221d8f1c
Component: cli
2018-07-07 18:13:12 +02:00
642f2f54c1 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-07-06 23:32:26 +00:00
126b4ecc06 Merge pull request #120 from seemethere/k
Add a `0.` to be more consistent with dev version
Upstream-commit: 225a141f3098dda91541f0f193a4a3c88f39f654
Component: packaging
2018-07-06 15:30:07 -07:00
d8b48fcc0c Add a 0. to be more consistent with dev version
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: eed5a3519f43d4603cdbc410059d191d9f2c54ea
Component: packaging
2018-07-06 22:21:52 +00:00
981ec3d944 Merge pull request #118 from seemethere/j
Merged with https://github.com/seemethere/unir
Upstream-commit: 680e6a05a1d55d97bcba7b4179a1af5a7526a30d
Component: packaging
2018-07-06 22:01:37 +00:00
b6e6c32f70 refactored all commands under cli/command/ to use sort.Slice instead of declaring custom types for sorting
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: ceed42217d
Component: cli
2018-07-06 15:49:32 -04:00
90fd78493d Make static versioning match RPM and DEB versioning
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c2afc0508ba0af6f50e99b9f1756a72748ff2bb1
Component: packaging
2018-07-06 18:45:11 +00:00
7925889650 Bump EPOCH to 1
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6456000a411bc00fa9f2b022ecda985d1e221869
Component: packaging
2018-07-06 18:23:35 +00:00
2c5fb6c781 Merge pull request #119 from seemethere/unir
Add unir yml
Upstream-commit: 946d2d4dd2648082955d55cd7f4d8348986a6517
Component: packaging
2018-07-06 14:05:07 -04:00
8c93c99508 Add unir yml
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6a5e5179ef2160c98c8e96a82a676703322c24c9
Component: packaging
2018-07-06 18:04:36 +00:00
8dfe97f6a1 Change dev versioning to be purely git based
Switches dev versioning from being based on a set version like
`18.06.0-dev` to being based purely on the git commit timestamp / git
commit sha.

This should give us a bit more flexibility in terms of nightlies not
being tied to specific versions.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 559c9a323a77fe1215f91d851ce72053ce5dd99b
Component: packaging
2018-07-06 17:59:30 +00:00
6c6aa8b73b Merge pull request #536 from andrewhsu/zero
set ver to 0.0.0-dev
2018-07-06 13:53:09 -04:00
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
23d14578b4 Merge component 'engine' from git@github.com:docker/engine master 2018-07-06 17:07:46 +00:00
136964a8f1 Merge component 'cli' from git@github.com:docker/cli master 2018-07-06 16:41:46 +00:00
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
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
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
ce46cc96e7 Merge component 'engine' from git@github.com:docker/engine master 2018-07-06 00:59:10 +00:00
31c1953e39 Merge component 'cli' from git@github.com:docker/cli master 2018-07-06 00:33:04 +00:00
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
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
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
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
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
33125af849 Merge component 'engine' from git@github.com:docker/engine master 2018-07-05 17:07:30 +00:00
06dc7cf0b2 Merge component 'cli' from git@github.com:docker/cli master 2018-07-05 16:41:46 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
6cd83dd22a Merge component 'engine' from git@github.com:docker/engine master 2018-07-03 23:43:12 +00:00
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
353f747d00 Merge component 'cli' from git@github.com:docker/cli master 2018-07-03 23:18:49 +00:00
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
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
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
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
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
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