54739fa6d1
Mount RO for timer_stats and latency_stats in proc
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 27ae108b4eda48a621afc5bf2157ef11c314a858
Component: engine
2015-05-07 14:42:23 -07:00
f9ca327070
Mount /proc/fs as readonly
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 42c8c1b0b884c91efa518568181d276afd9d866f
Component: engine
2015-05-07 14:42:23 -07:00
50f626562d
Prevent write access to /proc/asound
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
integration-cli/docker_cli_run_test.go
Upstream-commit: d87da59c79eabb794087f731d3ad51ea98f7a3cc
Component: engine
2015-05-07 14:42:23 -07:00
2ee6387cbc
Merge pull request #12165 from icecrime/optional_userland_proxy
...
Optional userland proxy
Upstream-commit: 74bfa3675353aaf10ca760e82a79d758bea0ff6b
Component: engine
2015-05-07 14:01:16 -07:00
cba2f6d1b5
Merge pull request #13067 from burke/faster-commit-for-overlay
...
overlay: skip superfluous metadata sets on commit
Upstream-commit: 93536cfa76fe57b8bc319c747596be935b385871
Component: engine
2015-05-07 13:58:46 -07:00
a3a2746534
Merge pull request #13068 from tianon/swap-builder-verbosity
...
Switch verbosity in builder/*/generate.sh so that we get download progress for Go instead of the name of every single file extracted
Upstream-commit: e712b60e806cd05adeb885f7dcc3098f0418de0d
Component: engine
2015-05-07 13:52:51 -07:00
52156c89d6
Merge pull request #13061 from tianon/install-update-message
...
Update "install.sh" warning to be more verbose
Upstream-commit: 2aa09b4f86f0424553f7172dfd3237874a8feb2a
Component: engine
2015-05-07 13:38:27 -07:00
0dfa2f6043
Update "install.sh" warning to be more verbose
...
See https://github.com/docker/docker/issues/12395#issuecomment-99941300 for some of the context on this one.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: fc9ff248c1ccb586297419336b6ad5da640f2bd5
Component: engine
2015-05-07 14:20:40 -06:00
0b0c4b0dfa
overlay: skip superfluous metadata sets on commit
...
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
Upstream-commit: bc5503f46bdc0816d90d99bd516afaa81717346a
Component: engine
2015-05-07 16:15:54 -04:00
52ea26d7d6
Switch verbosity in builder/*/generate.sh so that we get download progress for Go instead of the name of every single file extracted
...
Also, `curl` is smart enough to see when the consumer of the pipe is going slow that it should slow down the transfer, so this gives a reasonable indication of extraction progress too.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 24d98c14a0ee580018fdfcc465a76fd4a976e40f
Component: engine
2015-05-07 14:15:35 -06:00
5f4fd66d05
Merge pull request #13050 from SvenDowideit/dhe-docs-update
...
DHE documentation update sync.
Upstream-commit: 1e6565188d9fa6f13aa11b7f76e60c23fcf0082b
Component: engine
2015-05-07 11:43:04 -07:00
a1c865c350
Merge pull request #13058 from bharaththiruveedula/13057-remove-SetDaemon-method
...
Removing the SetDaemon method
Upstream-commit: 1ab875b38b012bca8ae1efc534ac5170b77024ea
Component: engine
2015-05-07 10:41:41 -07:00
8c72f57c04
Merge pull request #13044 from jpopelka/link-add
...
Fix firewalld callback.
Upstream-commit: 4f25f21a973012b8d780e1d907cf32682a9e0d14
Component: engine
2015-05-07 10:34:34 -07:00
aae3d1533f
Merge pull request #12966 from cpuguy83/cleanup_the_lxc_cleanup
...
Cleanup container reg for lxc special case
Upstream-commit: 3d2cd92b2d7229b2088f2f03ed46cf039361a6f6
Component: engine
2015-05-07 10:19:46 -07:00
7d4cfe310d
Merge pull request #12965 from tianon/libcontainer-logrus
...
Update libcontainer and make it the source of truth on logrus version
Upstream-commit: db26564864f5ef1f2402792ad8dd22bb62b3570c
Component: engine
2015-05-07 10:10:28 -07:00
0a2accc995
Removing the SetDaemon method
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com >
Upstream-commit: 94def48878294ff3b35f8724343b14e2c48a09f8
Component: engine
2015-05-07 22:25:13 +05:30
b9064ad316
Merge pull request #12822 from brahmaroutu/container_stop_api
...
restapi stop fails if ?t=int not present
Upstream-commit: d78755d15972fd1d3115d9927932f82bc09483df
Component: engine
2015-05-07 09:38:59 -07:00
2d3c25cbdc
Merge pull request #13037 from runcom/12607-no-strconv-atoi-err-check
...
Do not check and return strconv.Atoi error in api container restart
Upstream-commit: a38d6b575511d233be049964cec0411ff6beec81
Component: engine
2015-05-07 09:29:10 -07:00
e580063058
Restapi for stop fails if ?t=int not present
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 68e9c07850c95ded1e0a8adda39a8efe68e1c0ee
Component: engine
2015-05-07 15:43:50 +00:00
c26d05add9
DHE documentation update
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 59bfee2fa4f178660fa4cb2a9d18c924e86595a7
Component: engine
2015-05-07 20:38:46 +10:00
860e8ba926
Fix firewalld callback.
...
It needs to be called with same args as the one 4 lines above.
Signed-off-by: Jiri Popelka <jpopelka@redhat.com >
Upstream-commit: 6e8cfd63fcbf6d64b475b387cc66689582cc81c1
Component: engine
2015-05-07 10:08:49 +02:00
6284ff4960
Merge pull request #13038 from tianon/fix-build-deb
...
Fix build-deb
Upstream-commit: 443437f5ea04da9d62bf3e05d7951f7d30e77d96
Component: engine
2015-05-06 22:12:15 -07:00
f36df344d5
Cleanup container reg for lxc special case
...
The lxc code here is doing the exact same thing on calling
execdriver.Terminate, so let's just use that.
Also removes some dead comments originally introduced
50144aeb42283848db730b936d6b5b6332ec6565 but no longer relevant since we
have restart policies.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 44cd599e29451647492b3a5341ba23252a69ca27
Component: engine
2015-05-06 23:01:46 -04:00
35594b63f9
Merge pull request #13036 from SvenDowideit/update-docker-hub-repo-documentation
...
Add a userguide to cover the uses of Hub before creating new reposito…
Upstream-commit: a1aff84480971b73046b5d1ea572d860f0aa94ea
Component: engine
2015-05-06 18:02:23 -07:00
319058a95b
Add a userguide to cover the uses of Hub before creating new repositories
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 9da3a848abea56dff960baa8428dc073b70ec1de
Component: engine
2015-05-07 00:31:04 +00:00
5b2c5b9ceb
Merge pull request #13034 from icecrime/remove_insert_instruction
...
Remove unused Dockerfile instruction INSERT
Upstream-commit: a592dce97b98a33dd703308fb9fd1598798aef4d
Component: engine
2015-05-06 20:12:50 -04:00
a1ac14178e
Fix build-deb
...
This fixes the part of #12996 that I forgot. 👼
This also fixes a minor path issue (there's no `libexec` in Debian), and fixes a minor bug with the `debVersion` parsing.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 867eed8f3586c81b32dc9f85208692e9e1c9909a
Component: engine
2015-05-06 18:10:15 -06:00
e90b34218e
Do not check and return strconv.Atoi error in api container restart, regression
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 74121a42118750e560e772a3fee33e9d7bd903d0
Component: engine
2015-05-07 01:49:16 +02:00
d7923211b9
Remove unused Dockerfile instruction INSERT
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 596e91638cbe8b583dff4fdfc5a52e9d3840b20f
Component: engine
2015-05-06 16:26:43 -07:00
51100e4c20
Merge pull request #13033 from icecrime/12715_carry
...
Logs with follow=1 immediately send HTTP response
Upstream-commit: 4b4adae41c33da727b2d6be97f2257e169841ff8
Component: engine
2015-05-06 15:42:48 -07:00
ef04d9cd3c
Merge pull request #12980 from Microsoft/10662-filepathimageimage
...
Windows: Fix filepath vs path in image.go
Upstream-commit: f65e65b0c93bedfb8878d6366161a4f8e726eb8b
Component: engine
2015-05-06 15:02:10 -07:00
61b5e9a5f1
Merge pull request #12977 from Microsoft/10662-graphloadfilepath
...
Windows: Filepath in graph\load.go
Upstream-commit: 7d38d33f018a96bde5d08ae09628d4444b0aee26
Component: engine
2015-05-06 15:01:49 -07:00
c2f0a6e87e
Logs with follow=1 immediately send HTTP response
...
Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr >
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 589de35651ce8c91a2f01be2a5c99274d548d9ae
Component: engine
2015-05-06 14:39:45 -07:00
21b52b967c
Merge pull request #13018 from mbentley/nanorc-syntax
...
Added nanorc for Dockerfiles
Upstream-commit: 54a1bb07fac99d1c7f081f715096c31af535b140
Component: engine
2015-05-06 14:23:20 -07:00
3ae1ad9fa9
Merge pull request #12878 from cpuguy83/move_chunked_encoding_test_to_from_integration
...
Move ChunkedEncoding from integration
Upstream-commit: 10f4bf514d8d03a02a3c63698baa47b538773dcc
Component: engine
2015-05-06 13:59:13 -07:00
797d0589a2
Merge pull request #12999 from duglin/BadRUNerrMsg
...
Fix RUN's error msg when it fails
Upstream-commit: f9b20ad9e4fa7e7e200105b617ebcdedf38e8adf
Component: engine
2015-05-06 15:49:24 -04:00
b0726ee2a6
Merge pull request #13017 from cpuguy83/12859_fix_lxc_wait_exitcodes
...
Fix LXC stop signals
Upstream-commit: 71c1a7ea7f28a4e4bf3412af228524a28226ebeb
Component: engine
2015-05-06 11:21:44 -07:00
61793a6050
Move ChunkedEncoding from integration
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7c574b9e9d62f14c8d73ea358a557a771dcd8d4d
Component: engine
2015-05-06 13:00:17 -04:00
90d074b59f
Added nanorc for Dockerfiles
...
Signed-off-by: Matt Bentley <matt@docker.com >
Upstream-commit: 76bc44fb912c66498b8e6e714ce4aabd9eaef8dc
Component: engine
2015-05-06 12:41:11 -04:00
9c90d3e520
Fix LXC stop signals
...
`lxc-stop` does not support sending arbitrary signals.
By default, `lxc-stop -n <id>` would send `SIGPWR`.
The lxc driver was always sending `lxc-stop -n <id> -k`, which always
sends `SIGKILL`. In this case `lxc-start` returns an exit code of `0`,
regardless of what the container actually exited with.
Because of this we must send signals directly to the process when we
can.
Also need to set quiet mode on `lxc-start` otherwise it reports an error
on `stderr` when the container exits cleanly (ie, we didn't SIGKILL it),
this error is picked up in the container logs... and isn't really an
error.
Also cleaned up some potential races for waitblocked test.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d2c4ee37c6a4114b33a915b7dae6de70e27e7965
Component: engine
2015-05-06 11:56:48 -04:00
a78ec5ccea
Merge pull request #12975 from Microsoft/10662-graphexportfilepath
...
Windows: graph\export.go filepath fixes
Upstream-commit: a242ceaa0967a72dee55ef6a2cec05c78526d33c
Component: engine
2015-05-05 21:44:57 -04:00
898f9341bc
Merge pull request #12917 from jfrazelle/add-rpm
...
Add RPM for centos-7, fedora-20, fedora-21
Upstream-commit: 2281d6c266e87264d885314e2c4641ece725b161
Component: engine
2015-05-05 17:31:21 -07:00
309bf49758
Fix RUN's error msg when it fails
...
When RUN returns with a non-zero return code it prints the command
that was executed as a Go []string:
```
INFO[0000] The command &{[/bin/sh -c noop a1 a2]} returned a non-zero code: 127
```
instead it should look like this:
```
INFO[0000] The command "/bin/sh -c noop a1 a2" returned a non-zero code: 127
```
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 54662eae10923a0aca03ffddc1a30b7d25431c79
Component: engine
2015-05-05 16:08:41 -07:00
0017c3b28a
Add rpm for centos-6, centos-7, fedora-20, fedora-21
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 18beb5561140aaa950f00391a87bb332fb2b6aea
Component: engine
2015-05-05 16:05:30 -07:00
ba0c92d010
Fix issue where build steps are duplicated in the output
...
This fixes an issue where the build output for the "Steps" would look like:
```
Step 1: RUN echo hi echo hi
```
instead of
```
Step 1: RUN echo hi
```
Also, I noticed that there were no checks to make sure invalid Dockerfile
cmd flags were caught on cmds that didn't use cmd flags at all. They would
have been caught on the cmds that had flags, but cmds that didn't bother
to add a new code for flags would have just ignored them. So, I added
checks to each cmd to flag it.
Added testcases for issues.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 08b7f30fcd050244026098673b19700485308b5a
Component: engine
2015-05-05 15:28:42 -07:00
a50e168bdf
Merge pull request #13003 from moxiegirl/machine-branch-change
...
Updating branch for machine docs
Upstream-commit: 78c70cc36419ef0dca94a5f9a4d804d149fcb4ce
Component: engine
2015-05-05 14:49:44 -07:00
f6876820fd
Merge pull request #11844 from jbarbier/cgroup-parent-42
...
Adding cgroup-parent option for docker build
Upstream-commit: e960e4bb129de15b3beb7da37421e32af8dccf2f
Component: engine
2015-05-05 14:46:47 -07:00
df9fadfc2f
Updating branch for machine docs
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 8c9d67921a44e4f189373d8dc10fc8946039918d
Component: engine
2015-05-05 14:33:31 -07:00
dd653ee8c5
Merge pull request #12993 from psftw/support-tweak
...
Remove blanket "supported" language.
Upstream-commit: f0a8dfd29e4b009388d8b5e2c4386cc5d68bf4db
Component: engine
2015-05-05 16:03:02 -04:00
167bf1fe24
Merge pull request #12996 from tianon/abri-à-vélo
...
Replace "docker-core" with "docker-engine" in "build-deb"
Upstream-commit: 6bb596219f8c852cd48322ac9a4a4f605d29c6b8
Component: engine
2015-05-05 10:43:15 -07:00
