Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.10.3 cherrypicks #21011

Merged
merged 17 commits into from
Mar 8, 2016
Merged

1.10.3 cherrypicks #21011

merged 17 commits into from
Mar 8, 2016

Conversation

tiborvass
Copy link
Contributor

Please provide the following information:

  • What did you do?

I cherrypicked: #20981 #20834 #20831 #20737 #20706 #20636 #20725 #20729 #20672 #20682 #20685 #20680 #20647 #20417 #20967 #20697

  • How did you do it?

git cherry-pick -x origin/pull/$pr + resolving conflicts

  • How do I see it or verify it?

Read each commit and make sure all commits from the PRs are here. There should be exceptionally one commit per PR this time.

Especially review: f05d42e and ac47ad8 for which I needed to resolve not-that-trivial conflicts.

  • A picture of a cute animal (not mandatory but encouraged)

Vizsla

redbaron and others added 14 commits March 7, 2016 14:46
@redbaron
Fix libdevmapper deferred removal detection
8459636 
When linking, position of `-l` flags is important since
they muse come _after_ any object files which uses symbols
from a specified library, that is due to --as-needed binutils
ld flag enabled by default

Signed-off-by: Maxim Ivanov <ivanov.maxim@gmail.com>
(cherry picked from commit 24152a4)
@coolljt0725
Fix exec start api with detach and AttachStdin at same time. fixes mo…
3772dad 
…by#20638

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit fb0ac1a)
@cpuguy83
Close resp body on plugin call error
ba797dd 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 93ad9c3)
@estesp
Filter auto-created device list if user namespaces enabled
4899a04 
Because devices will be bind-mounted instead of using `mknod`, we need
to make sure the source exists and filter the list by only those whose
source is a valid path/current device entry.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)

(cherry picked from commit 9a554e8)
@cpuguy83
Fix panic when plugin responds with null volume
d0165c4 
In cases where the a plugin responds with both a null or empty volume
and a null or empty Err, the daemon would panic.
This is because we assumed the idiom if `err` is nil, then `v` must not
be but in reality the plugin may return whatever it wants and we want to
make sure it doesn't harm the daemon.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 96c79a1)
@estesp
Add synchronization and closure to IO pipes in userns path
54ab6ff 
The execdriver pipes setup uses OS pipes with fds so that they can be
chown'ed to the remapped root user for proper access. Recent flakiness
in certain short-lived tests (usually via the "exec" path) reveals that
the copy routines are not completing before exit/tear-down.

This fix adds synchronization and proper closure such that these
routines exit successfully.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)

(cherry picked from commit 9953867)
@runcom
pkg: idtools: fix subid files parsing
11a8469 
Since Docker is already skipping newlines in /etc/sub{uid,gid},
this patch skips commented out lines - otherwise Docker fails to start.
Add unit test also.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit bf04d68)
@anusha-ragunathan
Always create apt-ftparchive.conf.
97e7e23 
The Releases file(s) and other bits for EOL-ed distros such as Ubuntu
Vivid should remain untouched when we are releasing debs.

However, few files in https://apt.dockerproject.org/repo/dists/ubuntu-vivid/
were being updated for the docker 1.10 release including the Release files.
This is due to apt-ftparchive generating index files for vivid as well,
due to the stale apt-ftparchive.conf

This change always creates config using suites in contrib/reprepro/suites.sh.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 204c780)
@calavera
Make stdcopy.stdWriter goroutine safe.
a483ccc 
Stop using global variables as prefixes to inject the writer header.
That can cause issues when two writers set the length of the buffer in
the same header concurrently.

Stop Writing to the internal buffer twice for each write. This could
mess up with the ordering information is written.

Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit 443a5c2)
@mikedougherty
Use multiple keyservers in install script
4b2e7f0 
This improves on an earlier change by adding another keyserver and using a for loop instead of duplicating the command

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
(cherry picked from commit adac575)
@aaronlehmann
Fix concurrent uploads that share layers
f05d42e 
Concurrent uploads which share layers worked correctly as of moby#18353,
but unfortunately moby#18785 caused a regression. This PR removed the logic
that shares digests between different push sessions. This overlooked the
case where one session was waiting for another session to upload a
layer.

This commit adds back the ability to propagate this digest information,
using the distribution.Descriptor type because this is what is received
from stats and uploads, and also what is ultimately needed for building
the manifest.

Surprisingly, there was no test covering this case. This commit adds
one. It fails without the fix.

See recent comments on moby#9132.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 5c99eeb)
@rhatdan
Do not relabel if user did not request it for non local volumes
516ef83 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
(cherry picked from commit 843a119)
@justincormack
Add ipc syscall to default seccomp profile
eceeae4 
On 32 bit x86 this is a multiplexing syscall for the system V
ipc syscalls such as shmget, and so needs to be allowed for
shared memory access for 32 bit binaries.

Fixes moby#20733

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit 31410a6)
@justincormack
Add some uses of personality syscall to default seccomp filter
ac47ad8 
We generally want to filter the personality(2) syscall, as it
allows disabling ASLR, and turning on some poorly supported
emulations that have been the target of CVEs. However the use
cases for reading the current value, setting the default
PER_LINUX personality, and setting PER_LINUX32 for 32 bit
emulation are fine.

See issue moby#20634

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit 39b799a)
@tiborvass tiborvass added this to the 1.10.3 milestone Mar 7, 2016
@calavera
Do not wait for container on stop if the process doesn't exist.
1a10104 
This fixes an issue that caused the client to hang forever if the
process died before the code arrived to exit the `Kill` function.

Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit 1a729c3)
@tiborvass tiborvass force-pushed the 1.10.3-cherrypicks branch from c0caf30 to 2174eae Compare March 7, 2016 23:17
@calavera
Copy link
Contributor

calavera commented Mar 7, 2016

LGTM

1 similar comment
@cpuguy83
Copy link
Member

cpuguy83 commented Mar 7, 2016

LGTM

@thaJeztah
Copy link
Member

LGTM 😄

@aaronlehmann
Copy link
Contributor

LGTM

@tiborvass
Copy link
Contributor Author

For the record: https://jenkins.dockerproject.org/job/Docker-PRs-Win2Lin/22836/console

Tibor Vass added 2 commits March 7, 2016 23:54
Support TLS remote test daemon
e1211c7 
This will allow us to have a windows-to-linux CI, where the linux host
can be anywhere, connecting with TLS.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit f4a1e3d)
Update CHANGELOG for 1.10.3
f334602 
Signed-off-by: Tibor Vass <tibor@docker.com>
@tiborvass tiborvass force-pushed the 1.10.3-cherrypicks branch from 2174eae to f334602 Compare March 8, 2016 04:54
@thaJeztah
Copy link
Member

win2lin ran into #18672 (see https://jenkins.dockerproject.org/job/Docker-PRs-Win2Lin/22861/console)

05:50:14 FAIL: docker_cli_stats_test.go:94: DockerSuite.TestStatsAllNewContainersAdded
05:50:14 
05:50:14 docker_cli_stats_test.go:126:
05:50:14     c.Fatal("failed to observe new container created added to stats")
05:50:14 ... Error: failed to observe new container created added to stats

@tiborvass
Copy link
Contributor Author

windowsTP4 is expected to fail on the 1.10 branch.
win2lin passed except for TestStatsAllNewContainersAdded as mentioned above, which wasn't fixed, only skipped in master for now. I could have cherrypicked #20817 but since CI is having a lot of issues right now and that PR only changes test code, we're merging this.

@thaJeztah
Copy link
Member

but since CI is having a lot of issues right now and that PR only changes test code, we're merging this.

LGTM

tiborvass added a commit that referenced this pull request Mar 8, 2016
@tiborvass
Merge pull request #21011 from tiborvass/1.10.3-cherrypicks
8312389 
1.10.3 cherrypicks
@tiborvass tiborvass merged commit 8312389 into moby:bump_v1.10.3 Mar 8, 2016
@tiborvass tiborvass mentioned this pull request Mar 9, 2016
Merged
@tiborvass
Copy link
Contributor Author

For the record 3 commits from this PR were reverted in #21068.

@tiborvass tiborvass mentioned this pull request Mar 15, 2016
Merged
@thaJeztah thaJeztah mentioned this pull request Aug 17, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
status/2-code-review
Projects
None yet
Milestone
1.10.3
Development

Successfully merging this pull request may close these issues.