Commit Graph
37584 Commits
Author SHA1 Message Date
Daniel Nephin 5d87b0ddc9 Remove unused functions from archive.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 967ef7e6d2bd88a5d7010863f3d7138ca61b1939
Component: engine
2017-06-07 11:44:33 -04:00
Daniel Nephin 779caabedf Partial refactor of UID/GID usage to use a unified struct.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 09cd96c5ad2de369912cdf708c3c50f41e4586ac
Component: engine
2017-06-07 11:44:33 -04:00
Daniel Nephin 77734a6c63 Merge pull request #161 from vdemeester/update-codecov-threshold
Update codecov project threshold to 15%
Upstream-commit: 230b9eaf1a
Component: cli
2017-06-07 11:13:19 -04:00
Vincent Demeester 85d6b4b742 Handle case of configs on old daemon
If configs are declared for a service and pointing on an old
daemon, error out properly (instead of "page not found").

If there is no configs declared, don't call convertServiceConfigObjs
to avoid having an error.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cf5550c426
Component: cli
2017-06-07 17:02:46 +02:00
Madhu Venugopal af043a1e5b Vendoring libnetwork and netlink
libnetwork eb57059e91bc54c9da23c5a633b75b3faf910a68
netlink bd6d5de5ccef2d66b0a26177928d0d8895d7f969

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 5fd65a6b6c524e670f3b4ccced3974f63c1fd9a6
Component: engine
2017-06-07 06:20:27 -07:00
Vincent Demeester d8fa98915a Update codecov project threshold to 15%
That way, the build will fail less.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a132733939
Component: cli
2017-06-07 13:26:24 +02:00
Aaron Lehmann 6125da9d13 Merge pull request #155 from vdemeester/fix-and-update-vendor
Update vendoring of docker/docker
Upstream-commit: 583ed2e3be
Component: cli
2017-06-07 14:25:57 +03:00
Sebastiaan van Stijn 1ce23eb137 Merge pull request #33536 from aaronlehmann/silly-sprintfs
client: Use string concatenation instead of Sprintf
Upstream-commit: d2a83863ed764118ac985157c51418e434a8e354
Component: engine
2017-06-07 11:34:37 +02:00
Akihiro Suda 63a5fba1a8 builder: add a test for ENV name (without =value)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 09eca591f723f9acd0909b04144c229b6cd59912
Component: engine
2017-06-07 05:23:26 +00:00
Akihiro Suda 91bac6c3f8 Merge pull request #33330 from coolljt0725/fix_sock_is_dir
Don't create source directory while the daemon is being shutdown, fix #30348
Upstream-commit: cd2255a296acf8408d2afb65b897560479f1ecd3
Component: engine
2017-06-07 12:37:08 +09:00
Tibor Vass fea3e9d9a8 Merge pull request #33463 from mavenugo/ln-vin-1706
Vendoring libnetwork 2e99f06621c23a5f4038968f1af1e28c84e4104e
Upstream-commit: 64bb44546355053713e798e1ca021d280ddb8df7
Component: engine
2017-06-06 20:24:17 -07:00
Victor Vieux 3c1a09fba3 Merge pull request #33547 from vieux/report-2017-06-05
Moby Dev Report 2017 06 05
Upstream-commit: 18ce8ce33fa8e946fc90026e9c57ae9f8d5fed7c
Component: engine
2017-06-06 18:56:15 -07:00
Victor Vieux 4eb3d3cbf0 Moby report 2017-06-05
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 7a295b03336e48b0596d0e4d44ae19add3a56fb3
Component: engine
2017-06-06 18:53:09 -07:00
Eli Uriegas 1037ee0af4 Use internal systemd scripts for DEB packaging
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 477d0b1f735f7e243425cd2c5f48e8f216556c2f
Component: packaging
2017-06-06 14:56:39 -07:00
Eli Uriegas 418eb3ce3d Use internal systemd scripts for RPM packaging
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: cbfe576e680b19c5f4c992e52bee59f2bc540026
Component: packaging
2017-06-06 14:27:41 -07:00
Andrew Hsu 5b073ee2cf Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-06-06 21:12:46 +00:00
Andrew Hsu df30a62f60 Merge pull request #15 from andrewhsu/s390x
set $GOPATH/bin for s390x
Upstream-commit: baad4ca43af324a8e7758084054fd1ca30e13e10
Component: packaging
2017-06-06 14:09:00 -07:00
Andrew Hsu f34782e802 set $GOPATH/bin for s390x
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: f6d30c3631abee04aa3586cba36960901f705fe2
Component: packaging
2017-06-06 19:54:54 +00:00
Yong Tang b91462c403 Merge pull request #29427 from yongtang/29325-cleanup-btrfs-quota-groups
Remove btrfs quota groups after containers destroyed
Upstream-commit: 54dacaf23eaec0a5fd7d77ee906f08175d485bb7
Component: engine
2017-06-06 12:51:00 -07:00
Daniel Nephin 3b7dc655ab Fix check-git-diff so that it fails on CI
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f75a44ffd8
Component: cli
2017-06-06 15:06:34 -04:00
Andrew Hsu c982c7adf3 Merge pull request #14 from andrewhsu/notty
no need for tty
Upstream-commit: d3e0c2e866ea3a0f01c36830eca010985848a04e
Component: packaging
2017-06-06 11:38:36 -07:00
Andrew Hsu 402bd4febb no need for tty
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: ade95a2b6f8a16aa7e6c387dc9c9dd48bba9a672
Component: packaging
2017-06-06 18:33:59 +00:00
Boaz Shuster cc0cc953be Describe the differences between container-inspect and container-list
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: e8a1d99afb42d0931f7e1fd3df41611aafddf5a9
Component: engine
2017-06-06 21:33:08 +03:00
Eli Uriegas cbb74e3fb4 Add initial systemd scripts
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 7b31f87ffd8115f8226f68b788f5b36db53981f6
Component: packaging
2017-06-06 11:32:27 -07:00
Kenfe-Mickaël Laventure 28fd21b9d9 Merge pull request #33524 from dnephin/fix-onbuild-copy-cache
[Builder] Fix Cache with ONBUILD
Upstream-commit: f50249964788c144c2059f2c63e2f54473317ed3
Component: engine
2017-06-06 10:44:57 -07:00
Antonio Murdaca bd56d0486b daemon: correctly try to retrieve init/runtime versions
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 858b4b44c8172eb2c92767c8f624f4138db5212b
Component: engine
2017-06-06 19:36:24 +02:00
Daniel Nephin a7fe10a440 Fix Cache with ONBUILD
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f1ade82d82e6436971c6b7d08eb1da57ed9ba756
Component: engine
2017-06-06 10:52:29 -04:00
Aaron Lehmann 5f0ae0b377 integration-cli: Replace sleeps with polling in swarm lock/unlock tests
This will hopefully make the tests more robust by replacing a fixed 3s
sleep with a polling loop that looks at whether the key PEM file is
encrypted or not.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 17173efbe00d422392f91c672350266314808b28
Component: engine
2017-06-06 16:28:40 +03:00
Vincent Demeester 8c5fc4b2de Merge pull request #33516 from shishir-a412ed/remove_auth_config
Remove dead code: GetAuthConfig
Upstream-commit: 84149ac17d8ebfe8fc8995d9152114ed3071e884
Component: engine
2017-06-06 14:20:19 +02:00
Andrew Hsu 9950f73370 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-06-06 08:58:58 +00:00
Andrew Hsu fc32bb21ac Merge pull request #12 from andrewhsu/gen-man
generate man pages
Upstream-commit: b39d336d7f75858574b90531dbd6201d355c474a
Component: packaging
2017-06-06 01:56:49 -07:00
Sebastiaan van Stijn 0164928deb Merge pull request #158 from tiborvass/fix-manpages-script
Fix manpages script
Upstream-commit: 51b00f966e
Component: cli
2017-06-06 10:44:58 +02:00
Andrew Hsu 1b97ea3876 generate man pages
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: e14fca86f8230e10d79a7bfae2873a98a16bb44d
Component: packaging
2017-06-06 08:39:39 +00:00
Sebastiaan van Stijn a037b250cf Merge pull request #33471 from Snorch/sysconf-nrprocessors-onln-errno
Do not treat C.sysconf(C._SC_NPROCESSORS_ONLN) non-zero errno as error
Upstream-commit: 8b1adf55c2af329a4334f21d9444d6a169000c81
Component: engine
2017-06-06 10:22:41 +02:00
Tibor Vass 9b7bef68dd fix manpages script
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: dc81def89c
Component: cli
2017-06-06 05:00:10 +00:00
allencloud 9244630a6b choose rpc code to determine status code
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: f257f77c6c13ee851d3b899f8d51628a5dec92db
Component: engine
2017-06-06 10:08:50 +08:00
Tonis Tiigi cf0286328e Add builder dev report for 2017-06-05
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 0477bc4587d025b5b9b54ab810b6503b568d085c
Component: engine
2017-06-05 18:18:32 -07:00
Vincent Demeester a920b458df Update vendoring of docker/docker
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 44ac80881f
Component: cli
2017-06-06 00:23:21 +02:00
Tibor Vass 147ce7926d Merge pull request #154 from tiborvass/add-man-docs-scripts
Add scripts and targets for manpages and yamldocs
Upstream-commit: ed5b663082
Component: cli
2017-06-05 13:20:56 -07:00
Tibor Vass 4bf796daf6 Add scripts and targets for manpages and yamldocs
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: ff615dbc4d
Component: cli
2017-06-05 19:10:44 +00:00
Stefan Scherer b93aa08e64 Add link to docker-ce-packaging repo 2017-06-05 17:59:49 +02:00
Brian Goff a9c76c4bc8 Merge pull request #32293 from moypray/save_delete
Fix delete a image while saving it, delete successfully but failed to save it
Upstream-commit: c8141a1fb1ff33b2bfab85a40e5da9a282f36cdc
Component: engine
2017-06-05 09:55:56 -04:00
Vincent Demeester 80e1c19817 Merge pull request #33500 from dnephin/fix-onbuild-copy
Fix ONBUILD COPY
Upstream-commit: 34f1cd26b67271c0fce60ab87c0c51e28f1ab6f2
Component: engine
2017-06-05 11:48:57 +02:00
root 56fb42b612 Remove dead code: GetAuthConfig
Signed-off-by: Shishir Mahajan <shishir.mahajan3@gmail.com>
Upstream-commit: 02a759fa96bd16c0483c8e48c5658ee6b9739aa4
Component: engine
2017-06-05 00:40:47 +00:00
Akihiro Suda 76a64335a0 Merge pull request #33511 from vdemeester/remove-more-opts-runconfig
Remove some more `opts` from runconfig (not used anymore)
Upstream-commit: 7cf17f95f88bd61e677d722229b223cfe76ab6a0
Component: engine
2017-06-04 13:17:05 +09:00
Akihiro Suda c063e79268 Merge pull request #33512 from vdemeester/clean-cli-required
Remove unused functions
Upstream-commit: cc5ab6e6d45171f9fda4e77a6c52717d75c14e4b
Component: engine
2017-06-04 13:15:55 +09:00
Vincent Demeester b13daf9d28 Remove unused functions
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 236a125c3afdee30b739399aaea263c37cb28b04
Component: engine
2017-06-03 15:19:10 -07:00
Vincent Demeester b52fb8f6d2 Remove some more opts from runconfig (not used anymore)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0226a890fa6c25cd9664d037114237a1d85b602
Component: engine
2017-06-03 15:07:33 -07:00
Sebastiaan van Stijn 451b8c0ac8 Merge pull request #33502 from crosbymichael/bsd-opost
Set OPOST on bsd
Upstream-commit: df423d57936bf6e94bb1e54892f5419e1d927708
Component: engine
2017-06-03 02:30:58 +02:00
Victor Vieux e9e0d884b4 Merge pull request #33477 from dnephin/move-builder-pkgs
Split and remove pkg/gitutils and pkg/httputils
Upstream-commit: b28cbed66df6ad06afd2d91b3c67245459ec37ff
Component: engine
2017-06-02 17:07:45 -07:00