Commit Graph

3709 Commits

Author SHA1 Message Date
db7f1cc524 Merge pull request #24128 from thaJeztah/rename-desired_state-filter
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
2016-07-01 18:34:02 +02:00
bda6fa8f54 Add support for external CAs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 11085b2260a78b3248f3e98e0a1e3203431fae22
Component: engine
2016-06-30 17:22:47 -07:00
b73379e968 Update to new swarmkit/engine-api
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 9b652738363d92fbe6e43b3981cdcc94bdb72c76
Component: engine
2016-06-30 17:22:47 -07:00
e32550579c Merge pull request #23584 from nishanttotla/private-images-swarm-services
Passing registry auth token for service create, update
Upstream-commit: 8fe6480c8a26f80fe174ae93e1b380bb7ec6083c
Component: engine
2016-06-30 17:18:59 -07:00
9f0a770513 Adding a flag to specify sending of registry auth
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 538bac39d7fe93562922b89e9a294096be48fb59
Component: engine
2016-06-30 14:59:32 -07:00
6b4b42d73a rename desired_state filter to desired-state
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d761719eb4e45fbd6f092f6d0b4eb42206e298f6
Component: engine
2016-06-30 14:49:46 -07:00
6bcf7ca500 Merge pull request #24091 from AkihiroSuda/fixZFS24008
zfs: call mount.MakePrivate
Upstream-commit: b8cef7c19cea0f4ee670a9362154716b2313a18f
Component: engine
2016-06-30 11:14:30 -07:00
c89614146c Merge pull request #24007 from LK4D4/fix_close_races
daemon/logger: fix races in channel close
Upstream-commit: e8439971b42a65dd831f80ec76a38e8c8e938cb6
Component: engine
2016-06-30 15:21:17 +02:00
660ae2c902 Merge pull request #24149 from mavenugo/kn
Added missing flags for swarm-mode networks
Upstream-commit: cc024095c99edfec556bb2f5840279490fff4218
Component: engine
2016-06-30 12:23:45 +02:00
e667b026a1 Add detail error logs when 'Unknown Device' error happens if devicemapper storage is used.
Signed-off-by: yuzou <zouyu7@huawei.com>
Upstream-commit: d4a2bcc9ac49d07c71822ce72b97861d5844b46d
Component: engine
2016-06-30 13:06:14 +08:00
bd38c4db96 Added missing flags for swarm-mode networks
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: cf78863e9dc4e3480a7d1059ed306bdfd81cd3dc
Component: engine
2016-06-29 15:30:57 -07:00
29d2889a79 Merge pull request #23789 from tonistiigi/swarm-integration-tests
Update swarm integration tests and shutdown synchronization
Upstream-commit: 9162011680efa714788377651e51872bb852e2e3
Component: engine
2016-06-29 14:09:57 -07:00
cddb6e635c Updating header name and executor
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: af5df117a805c8df661c7efa58c57680019b5752
Component: engine
2016-06-29 13:26:19 -07:00
d4e14be148 Merge pull request #23955 from yongtang/23768-cpu-count
Fix wrong CPU count after CPU hot-plugging
Upstream-commit: 50a173e3d5ca8ed3b52c53fde6729188fc02e9e7
Component: engine
2016-06-29 12:00:13 -07:00
7dfc0b0c86 Merge pull request #24050 from ncoolz/issue-cluster-store-config
Fix check code for --cluster-store and --cluster-advertise in config_…
Upstream-commit: 2f9d20288c7b1ebf6f0a9888e6af9b5262d49484
Component: engine
2016-06-29 19:15:23 +02:00
ed5060064e zfs: call mount.MakePrivate
Fix #24008

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5ec8441bb55ecbf83da6407a4135ce83b1fe01c7
Component: engine
2016-06-29 01:55:45 +00:00
b75c9d3100 Passing registry auth token for service create and update
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 93ec5cda55e78dbb683b59bde244a7984b323574
Component: engine
2016-06-28 13:53:01 -07:00
860c6cce0c overlay2: close read end of pipe on mount exec
Use StdinPipe to ensure pipe is properly closed after startup

Fixes #23686

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: ad4b3e11fe41080d66ac1780b455246ae18bdc35
Component: engine
2016-06-28 13:23:00 -07:00
12a56855f7 Fix check code for --cluster-store and --cluster-advertise in config_unix.go
Signed-off-by: Wonjun Kim <wonjun.kim@navercorp.com>
Upstream-commit: 4f671ae85e62d0b413f913b1289100ae7cc45972
Component: engine
2016-06-29 02:36:43 +09:00
3fd6864743 daemon/logger: fix races in channel close
it's actually not okay to do such trick from multiple goroutines

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 378f0657f963fa6c854643571e4fe83628466c01
Component: engine
2016-06-27 14:14:23 -07:00
3aaad04eea Merge pull request #23182 from crosbymichael/maxkeys
Change root_maxkeys
Upstream-commit: 8e8ef7c724accb8d3038ff14ab878b24af8a6f03
Component: engine
2016-06-27 13:46:11 -07:00
c0eb5739c1 Merge pull request #23775 from mlaventure/change-stock-runtime-alias
Use "runc" as alias for the default runtime
Upstream-commit: 91fa49071d7373ccdee4585b403b488e1fce2efa
Component: engine
2016-06-27 11:55:46 -07:00
f68bab271b Change root_maxkeys
Most modern distros have the limit for the maximum root keys at 1000000
but some do not.  Because we are creating a new key for each container
we need to bump this up as the older distros are having this limit at
200.

Using 1000000 as the limit because that is that most distros are setting
this to now.  If someone has this value configured over that we do not
change it.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ca3e4545aa7d0da3a36fef41d85d02e9f2c4d15d
Component: engine
2016-06-27 10:23:37 -07:00
0d19acd851 Remove blank line on daemon output when there are no containers to load
Its a minor thing but the daemon's output looks like this when there are
no containers to load:
```
INFO[0001] Loading containers: start.

INFO[0001] Loading containers: done.
```
That blank line (or more correctly, the \n) is unnecessary when
there are no containers to load since there is no `.` printed

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 478dd721ab7aca37264897b664dfa2ec953d7048
Component: engine
2016-06-26 10:51:34 -07:00
bde674f465 Fix wrong CPU count after CPU hot-plugging
This fix tries to address issues raised in #23768 where the CPU count
is not updated after cpu ho-plugging.

This fix follows the suggestion from #23768 and replace go's `runtime.NumCPU()`
with `sysconf(_SC_NPROCESSORS_ONLN)` so that correct CPU count could
be obtained even after CPU hot-plugging.

This fix is tested manually, as is suggested in #23768.

This fix fixes #23768.

The NumCPU() in Linux is based on @wmark 's implementation.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 8b2383f5c1108c590928c0e6c57f1f0aa0dd36f6
Component: engine
2016-06-25 20:48:36 -07:00
5058cd0f45 Merge pull request #23939 from vdemeester/rename-same-no-lock
No need for container.Lock if rename same name
Upstream-commit: 9ed0feece84f44d449c62f091566e119e97b7b63
Component: engine
2016-06-25 14:56:20 +02:00
96af8ab680 Merge pull request #23942 from aaronlehmann/sanbox
Fix "sanbox" typos
Upstream-commit: eae254d98b55d6d29aceb697af48e1aec20b2fb3
Component: engine
2016-06-25 11:27:46 +02:00
5c10897dd4 Fix race on clearing swarm nodes on stop
On stop there were multiple places that marked
`cluster.node` nil. Now stop waits for the node to
set itself nil.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 1a8a473017299c5e999d55d14634874826062fce
Component: engine
2016-06-24 13:57:02 -07:00
da85d118fb Merge pull request #23940 from allencloud/fix-err-msg
fix error message and typos in swarm cluster
Upstream-commit: 7ff546467de3fa3d1c1104e9f40c6d16742ebac0
Component: engine
2016-06-24 16:57:01 -04:00
f3ebf274bf fix error message and typos in swarm cluster
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 39bc10c36d40677c11a800b4346c5cddec2b997d
Component: engine
2016-06-25 03:10:18 +08:00
5fee17f637 Remove log warning on task update
This warning appears in the course of normal use of swarm mode. Since
it's meant more as an internal TODO than something which should be
exposed to a user, remove the log message.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 39c93cfb47783f2531ba44f062fd9a8b351d2224
Component: engine
2016-06-24 12:07:47 -07:00
54c97d32bb Fix "sanbox" typos
Correcting "sanbox" to "sandbox".

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: fa04558ac10d70bcdd501f01a5090607db32cc3a
Component: engine
2016-06-24 12:04:26 -07:00
b45c320ba6 Merge pull request #23914 from tonistiigi/upadate-manager-error-message
Add better error messages for unavailable swarm commands
Upstream-commit: e8ec19bd877847ddfd42cae4eddec83088e234fe
Component: engine
2016-06-24 12:02:34 -07:00
ebe2054ea2 No need for container.Lock if rename same name
During the renaming of a container, no need to call `container.Lock()`
if `oldName == newName`.

This is a follow-up from #23360 (commit 88d1ee6c112d980a63c625389524047fea32e6d9)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7e1ec8d2bd6d1aa77f824a1a4d717a7aa4cc3459
Component: engine
2016-06-24 19:55:48 +02:00
299779b4ac Merge pull request #23360 from sainath14/rename_error
docker rename fix to address the issue of renaming with the same name
Upstream-commit: 88d1ee6c112d980a63c625389524047fea32e6d9
Component: engine
2016-06-24 19:54:09 +02:00
009e2dd2e1 Add better error messages for unavailable swarm commands
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 803733120a1f9f080c6403f2a3717987393f1f0d
Component: engine
2016-06-24 10:14:57 -07:00
a463fd07fe Merge pull request #23881 from tonistiigi/exec-wait
Fix error reporting on executor wait
Upstream-commit: e82dcf1c6de82680ae34a64735d0da0c080085ba
Component: engine
2016-06-24 11:18:49 -04:00
6af42f8c0d Merge pull request #23912 from dmcgowan/fix-overlay2-whiteout-exclusion
Fix overlay2 ignoring whiteout files
Upstream-commit: 37fe4bdb59cae499cefb0d8bce8c28b894cd6f98
Component: engine
2016-06-24 01:06:38 +02:00
066b0582fe Fix overlay2 ignoring whiteout files
Currently when overlay creates a whiteout file then the overlay2 layer is archived,
the correct tar header will be created for the whiteout file, but the tar logic will then attempt to open the file causing a failure.
When tar encounters such failures the file is skipped and excluded for the archive, causing the whiteout to be ignored.
By skipping the copy of empty files, no open attempt will be made on whiteout files.

Fixes #23863

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: bd13c53f8dc1504c9e681dfabef2afc1685ccec7
Component: engine
2016-06-23 13:34:38 -07:00
fbf0465b15 Merge pull request #23790 from tonistiigi/skip-pull
Skip always pulling images on integration tests
Upstream-commit: 487931902c1177352e4eceec1b5ef558a5ba24cc
Component: engine
2016-06-23 11:47:33 -07:00
9d859318a6 Fix error reporting on executor wait
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: c895a76f1076c782011e9decf58ab6548cf0fb35
Component: engine
2016-06-22 18:12:51 -07:00
40dd500778 Use "docker-runc" as alias for the default runtime
This also moves the variable holding the default runtime name from the
engine-api repository into docker repository

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 69af7d0d13670b8e2a03a38b4d9a849fc109b338
Component: engine
2016-06-22 11:59:26 -07:00
c04403422d Merge pull request #23829 from LK4D4/cleanup_unused
api,daemon: cleanup some unused stuff
Upstream-commit: 506234e3f0f6d8f8a0629e09f38dfe96ada025c2
Component: engine
2016-06-22 11:58:57 -07:00
266d9f9808 Merge pull request #23832 from tonistiigi/unify-swarm-init-update
Unify swarm init and update options
Upstream-commit: df6630f6a3c08548f355a255e18f01c9fcb0ad86
Component: engine
2016-06-22 11:56:07 -07:00
f6a8b95a82 Merge pull request #23835 from swernli/loggerfix
Fixing file handle leak for "docker logs"
Upstream-commit: 7eae48cd21f12a64c97c76f60412f32a2f1ade78
Component: engine
2016-06-22 11:52:55 -07:00
a75adf3964 Merge pull request #23797 from liubin/fix-typo
fix some typos
Upstream-commit: 4962fea757415087755d7683e73bc0c7c7a39921
Component: engine
2016-06-22 11:56:48 +10:00
6e7f3b1cd8 Merge pull request #23738 from psiclops/typos
Fix misspell typos
Upstream-commit: e76e52b38b9829ccf613995f2afa0394230800ef
Component: engine
2016-06-22 11:56:13 +10:00
675aa5766a Fixing file handle leak for "docker logs"
If "docker logs" was used on an offline container, the logger is leaked, leaving it up to the finalizer to close the file handle, which could block removal of the container.  Further, the json file logger could leak an open handle if the logs are read without follow due to an early return without a close.  This change addresses both cases.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 54f11b84d218c1a7ff4ab4e2148819265da213bc
Component: engine
2016-06-21 18:40:30 -07:00
8c9dd4362c Unify swarm init and update options
Add api side validation and defaults for init and
join requests.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
2016-06-21 16:34:32 -07:00
44cb4a4db6 api,daemon: cleanup some unused stuff
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ed5d335e22143b35f928e5a8740b046c21db808b
Component: engine
2016-06-21 14:15:19 -07:00