Commit Graph

40535 Commits

Author SHA1 Message Date
c18ca5abde Merge component 'cli' from git@github.com:docker/cli master 2018-04-05 16:41:29 +00:00
89747f2a26 Merge pull request #981 from vdemeester/docs-fix-stack-deploy-reference
Fix `docker stack deploy` reference flag
Upstream-commit: 62104e2497
Component: cli
2018-04-05 09:32:41 -07:00
cb04b581ce Merge pull request #983 from vdemeester/972-fix-merge-network
Fix error with merge composefile with networks…
Upstream-commit: 3eb215c128
Component: cli
2018-04-05 09:31:26 -07:00
96e7de35a2 Fix error with merge composefile with networks…
… and other cases too. Updating mergo fixes the bugs (but introduced a
slight behaviour change that had to be fixed too)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0122730faf
Component: cli
2018-04-05 10:37:35 +02:00
3ccf86f831 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-04-04 18:09:40 +00:00
15dcf3ac74 Merge component 'engine' from git@github.com:moby/moby master 2018-04-04 18:09:33 +00:00
bf1e88e279 Merge pull request #98 from seemethere/f28
Add packaging code for Fedora 28
Upstream-commit: 9efc79dd124c6c2a07488e68ddbad1558b8e5e30
Component: packaging
2018-04-04 09:44:21 -07:00
e416848066 Merge pull request #36701 from thaJeztah/bump-swarmkit
Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff
Upstream-commit: 094aa1a5527df23922e1de85919da7ab67455067
Component: engine
2018-04-03 21:22:52 -07:00
06bbeec2bc Add packaging code for Fedora 28
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 00148a3c994c753a3e171b1aa2b422342e00fd16
Component: packaging
2018-04-03 23:50:57 +00:00
1e976c5ef2 Merge component 'engine' from git@github.com:moby/moby master 2018-04-03 23:35:47 +00:00
bf5c5d2816 Merge pull request #36749 from stevvooe/update-containerd-1.0.3
containerd: update to 1.0.3 release
Upstream-commit: 10ca8d9771fd0d4051cb8291d7980ae909d437f7
Component: engine
2018-04-03 12:07:26 -07:00
b7c2550378 Merge component 'engine' from git@github.com:moby/moby master 2018-04-03 17:06:38 +00:00
dcc0cb0975 Merge component 'cli' from git@github.com:docker/cli master 2018-04-03 16:41:31 +00:00
ebe9fb4969 Merge pull request #36774 from AkihiroSuda/libnetwork-20180403
update libnetwork to improve scalabiltiy of bridge network isolation rules
Upstream-commit: eb3f0252d0187d61f591f88be1ac583c910df0e3
Component: engine
2018-04-03 09:21:10 -07:00
2da3a78249 Merge pull request #36762 from zorrorffm/moby_dev
Add quotation marks for $CURDIR
Upstream-commit: 6c0d6236117effb139dd3d3edf984877f81e0a94
Component: engine
2018-04-03 10:28:11 +02:00
77bb3ea6e7 Fix docker stack deploy reference flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2ee9635b1e
Component: cli
2018-04-03 10:11:52 +02:00
0b341811fc update libnetwork to improve scalabiltiy of bridge network isolation rules
* libnetwork#2121: Retry other external DNS servers on ServFail
* libnetwork#2125: Fix README flag and expose orphan network peers
* libnetwork#2126: Adding goreport card
* libnetwork#2130: Modify awk to use cut in check_ip_overlap
* libnetwork#2117: [Carry 1534] Improve scalabiltiy of bridge network isolation rules

Full changes: 2bf63300c5...5c1218c956

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: b159da19734269c4a162763ebfa28dff07b703f3
Component: engine
2018-04-03 16:50:00 +09:00
6a9a060b45 Merge pull request #979 from joaofnfernandes/docs-secrets-6294
Use printf, not echo when creating secrets
Upstream-commit: 17aaad6f06
Component: cli
2018-04-03 09:45:11 +02:00
f323a813e1 Merge pull request #36724 from dnephin/api-docs-add-build-target
Add target field to build API docs
Upstream-commit: 045206a45c15625249d7956a6e18d2accaab6383
Component: engine
2018-04-02 22:35:00 -07:00
54e71e814c Merge pull request #36770 from mrueg/36754-follow-up-test
Fix tests for pkg/archive
Upstream-commit: a2db190088a6c11af05023469733f3293c741084
Component: engine
2018-04-03 13:49:48 +09:00
d94b697fa2 Merge pull request #980 from thaJeztah/fix-history-format-placeholder
Fix --format example for docker history
Upstream-commit: 4faf9a1736
Component: cli
2018-04-02 20:14:51 -07:00
7b60a70f28 Fix tests for pkg/archive
Signed-off-by: Manuel Rüger <manuel@rueg.eu>
Upstream-commit: 108bbd96cb6f9aaa2a761e1a33250f36d58882f9
Component: engine
2018-04-03 01:17:52 +02:00
74a9225ea5 Fix --format example for docker history
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2f7bf40e73
Component: cli
2018-04-02 16:07:40 -07:00
314f0caa92 Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff
Changes included:

- Ingress network should not be attachable
- [manager/state] Add fernet as an option for raft encryption
- Log GRPC server errors
- Log leadership changes at manager level
- [state/raft] Increase raft ElectionTick to 10xHeartbeatTick
- Remove the containerd executor
- agent: backoff session when no remotes are available
- [ca/manager] Remove root CA key encryption support entirely
- Fix agent logging race (fixes https://github.com/docker/swarmkit/issues/2576)
- Adding logic to restore networks in order

Also adds github.com/fernet/fernet-go as a new dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 27749659d5a30999691e401a351221780a483099
Component: engine
2018-04-02 15:17:38 -07:00
15ef970018 Use printf, not echo when creating secrets
Update the docs so that users don't use `echo` when creating
secrets from STDIN. `echo` adds a trailing new line, so users
will probably be confused when their passwords don't work.

Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
Upstream-commit: 5238f3e93e
Component: cli
2018-04-02 15:15:19 -07:00
35efc4d5f1 containerd: update to 1.0.3 release
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 554d657c1f7a0f4dce51f0d26407fb05a0580fa1
Component: engine
2018-04-02 13:42:49 -07:00
1841491e85 Merge pull request #36745 from arm64b/fix-misused-nwname
Fix a misused network object name
Upstream-commit: 785b3e32876e10d638d9b1bae00e3f340a2f47ec
Component: engine
2018-04-02 10:35:20 -07:00
766917be06 Add quotation marks for $CURDIR
This change fixes bug when $CURDIR contains special character e.g. '&&'.

Change-Id: I658eb60d97c2229cf8b4e0a61dbbecf3edc9d573
Signed-off-by: Fangming.Fang <fangming.fang@arm.com>
Upstream-commit: 83062593d7ce759bb96e271e30460afa4a695dba
Component: engine
2018-04-02 05:48:35 +00:00
84fd46c694 Merge pull request #36756 from redbaron/userns-copy-fifo-fix
Fix FIFO, sockets and device files when run in user NS
Upstream-commit: 7410b046491a027fa49cc69475c09fa929b9f810
Component: engine
2018-04-01 20:02:11 -07:00
94036de956 Fix FIFO, sockets and device files when run in user NS
commit 617c352e9225 "Don't create devices if in a user namespace"

introduced check, which meant to skip mknod operation when run
in user namespace, but instread skipped FIFO and socket files
copy.

Signed-off-by: Maxim Ivanov <ivanov.maxim@gmail.com>
Upstream-commit: 6f084f292932c464a30b56edb9edbe238bdcf0aa
Component: engine
2018-04-01 12:33:59 +01:00
b0b28797bc Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-03-31 17:06:47 +00:00
fafe3fe50a Merge component 'engine' from git@github.com:moby/moby master 2018-03-31 17:06:40 +00:00
861c35095f Merge pull request #100 from seemethere/update_readme
Add Bionic to README
Upstream-commit: 9e33949813b2589271f7a4535008b209d95200ab
Component: packaging
2018-03-30 15:13:50 -07:00
96b3d4192f Add Bionic to README
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 205c26fc9d83bfcb04b39d7b3fb5ae9c1fcbbcc3
Component: packaging
2018-03-30 22:12:42 +00:00
8e1baea5f9 Merge pull request #36706 from arm64b/add-defult-timeout-config-func
Add default pollSettings config functions
Upstream-commit: 635f359f8b61887faa9427d9c673be96faf992b5
Component: engine
2018-03-30 19:31:06 +02:00
fb9c6b4cbb Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-03-30 17:06:07 +00:00
09c16ca1db Merge component 'engine' from git@github.com:moby/moby master 2018-03-30 17:06:00 +00:00
57682a5381 Merge pull request #36715 from cpuguy83/plugin_exec_fixes
Make sure plugin container is removed on failure
Upstream-commit: 859e43e64c4358c9aa48e045c0e5b048361a4c9b
Component: engine
2018-03-30 13:17:31 +02:00
d785136a3a Fix a misused network object name
A minor nit. `test01` never been created and used in
`TestDockerNetworkInspectCustomSpecified()` function, so correct it.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Upstream-commit: f041953d04bffa2be05466173f02dd016c68286d
Component: engine
2018-03-30 09:47:41 +00:00
9113717a6d Merge pull request #36741 from tonistiigi/yamllint
dockerfile: restore yamllint
Upstream-commit: 1d59c66b704ad94f9f7b40b82b9df16cc6082a0a
Component: engine
2018-03-30 10:22:44 +01:00
187be19082 Merge pull request #36736 from tonistiigi/remove-test-kernel-version
copy: remove kernel version test
Upstream-commit: 6c948b562d826fd95da5f972305d22c47a479494
Component: engine
2018-03-30 10:53:40 +02:00
fa2b7ebcd9 Merge pull request #36734 from cpuguy83/context_directory_size
Support cancellation in `directory.Size()`
Upstream-commit: f0b9eb8627b0bbf3cbd95edd78cc552cb3626520
Component: engine
2018-03-30 10:38:33 +02:00
85555b0bc6 Merge pull request #36726 from chungers/raft-params
Expose swarmkit's Raft tuning parameters in engine config
Upstream-commit: 8b6a8271a62eec40827bf77f32b794f650556c24
Component: engine
2018-03-29 17:19:04 -07:00
bdbb1213a7 dockerfile: restore yamllint
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 708b068d3095c6a6be939eb2da78c921d2e945e2
Component: engine
2018-03-29 16:43:31 -07:00
9b41292c7f Support cancellation in directory.Size()
Makes sure that if the user cancels a request that the daemon stops
trying to traverse a directory.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9d46c4c138d7b3f7778c13fe84857712bd6c97a9
Component: engine
2018-03-29 15:49:15 -04:00
1e72ac567b Merge pull request #99 from seemethere/arm64_bionic
Add Ubuntu 18.04 arm64 builds
Upstream-commit: bad901ee77ac8aebb7cf7207bd4eb153e7a0f05d
Component: packaging
2018-03-29 11:37:51 -07:00
9a9ab34587 Add Ubuntu 18.04 arm64 builds
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: aac8310bbee3c7480487a624756d25d22d53c7dd
Component: packaging
2018-03-29 18:09:08 +00:00
c26d6b4944 copy: remove kernel version test
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4d6b8f73a89abf715fa33b3f553884c575a3b136
Component: engine
2018-03-29 10:45:43 -07:00
72c010f740 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-03-29 17:06:47 +00:00
68ce936581 Merge component 'engine' from git@github.com:moby/moby master 2018-03-29 17:06:40 +00:00