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
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
0d9ff7b940
Merge pull request #13004 from duglin/FixBuilderStepMsg
...
Fix issue where build steps are duplicated in the output
Upstream-commit: b5d68944f49136fab1edb2c297ae246fd1e42fbc
Component: engine
2015-05-05 16:06:50 -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
ae45d9cbea
Make a docker-in-docker dynamic binary and add RPM target
...
This change adds a new docker-in-docker dynamic binary make target which
builds a centos container for creating the dynamically linked binary.
To use it, you first must create the static binary and then call the
dind-dynbinary target. You can call it like:
$ hack/make.sh binary dind-dynbinary rpm
This would then package the dynamic binary into the rpm after having
created it in the centos build container. Unfortunately with this approach
you can't create the rpms and the debs with the same command. They have to
be created separately otherwise the wrong version (static vs. dynamic) gets
packaged.
Various RPM fixes including:
- Adding missing RPM dependencies.
- Add sysconfig configuration files to the RPM.
- Add an epoch to silence the fpm warning.
- Remove unnecessary empty package.
Signed-off-by: Patrick Devine <patrick.devine@docker.com >
Signed-off-by: Chad Metcalf <chad@docker.com >
Upstream-commit: 878dcb89f38e8eb7bb07ccd4a4e5ce622252ff30
Component: engine
2015-05-05 10:01:39 -07:00
d6fea09c44
Merge pull request #12947 from runcom/11577-readonly-special-file-if-readonlyfs
...
Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only enabled
Upstream-commit: 77266a67e0e1fc9ec2b026bf0a57a14188ec5224
Component: engine
2015-05-05 09:45:24 -07:00
6c4c56e1c3
Merge pull request #12679 from adcaes/12607-remove-error-check
...
Add intValue and use it to get timeout form param in postContainersRestart
Upstream-commit: e894a901dbff5aafcc0919b78e01a4ab18f2a582
Component: engine
2015-05-05 09:38:45 -07:00
e1c57390f1
Replace "docker-core" with "docker-engine" in "build-deb"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 5e563d170815ce3111eb66b44cfd252c80d8f34c
Component: engine
2015-05-05 10:11:59 -06:00
215af7ab57
Remove blanket "supported" language.
...
Signed-off-by: Peter Salvatore <peter@psftw.com >
Upstream-commit: 3efc083d4a785b2c7b1c1f862133167d5618d216
Component: engine
2015-05-05 11:03:53 -04:00
3f873c25b6
Rename int64Value to int64ValueOrZero.
...
Signed-off-by: Adria Casas <adriacasas88@gmail.com >
Upstream-commit: a2c76912e04b087233577b46f96f446c5d13e2de
Component: engine
2015-05-05 08:54:28 +02:00
da6438ab18
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
Upstream-commit: 91fb4d672a8536d2f0437aeeb2dfc7b9e51aac16
Component: engine
2015-05-04 22:28:01 -07:00
655d129aac
Merge pull request #12979 from Microsoft/10662-filepathgraphpush
...
Windows: Fix filepath vs path in push.go
Upstream-commit: f838d442839d4dd74623303f22de17959b31eaa9
Component: engine
2015-05-04 22:25:13 -07:00
b677241c30
Merge pull request #12981 from SvenDowideit/marc-merlin-spelling-fix
...
spelling fix from Marc MERLIN
Upstream-commit: 677b962642da7778105f68ecc64f34b9ea3b7f05
Component: engine
2015-05-04 17:53:37 -07:00
a3d3fbb773
spelling fix from Marc MERLIN
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: bba5fd8caa35d5edf8b68e593eafb277394a6989
Component: engine
2015-05-05 00:38:41 +00:00
23b13c08d5
Windows: Fix filepath vs path in image.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1c3b697d60bc1a5f5197b0c3a432002cf03c8277
Component: engine
2015-05-04 16:23:17 -07:00
9c31de00f9
Merge pull request #12890 from SvenDowideit/update-docker-hub-accounts-documentation
...
Update the Docker Hub account, org and group documentation and images
Upstream-commit: 77183ed760b5df4ab70e7cf8fc268e66a295c7cc
Component: engine
2015-05-04 16:23:08 -07:00
d33c276cc3
Windows: Fix filepath vs path in push.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3b2c8f69fd7f1ca6a463b9bd2c2e006d9e13fe98
Component: engine
2015-05-04 16:18:23 -07:00
1195e97bff
Windows: Filepath in graph\load.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bb1ecde1648220871bbf627b8a844fc8501163ba
Component: engine
2015-05-04 15:14:39 -07:00
e1e136fe26
Windows: graph\export.go filepath fixes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 377ed712d38e75d24ebfe2b5b91455a77bf8b086
Component: engine
2015-05-04 14:56:23 -07:00
11e5be135f
Merge pull request #12190 from rhvgoyal/deferred-removal
...
Devicemapper: Provide deferred device removal capability
Upstream-commit: 56c991781564e8cc292166d3b3e27e304c240468
Component: engine
2015-05-04 14:22:52 -07:00
71f810ba24
Merge pull request #12948 from runcom/api-tests-container-delete
...
Add tests for API container delete
Upstream-commit: 980c0e8c3b58a45dbabc9f10b4933db2bcaec8c1
Component: engine
2015-05-04 17:08:52 -04:00
0f648e8ecd
Add tests for API container delete
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 8771cafab65e50d09d3590a7f22758e919b78fe4
Component: engine
2015-05-04 22:41:57 +02:00
e79952cb66
Merge pull request #12718 from Microsoft/10662-mkdirall
...
Windows: Volume path aware mkdirall
Upstream-commit: 3fcf387d52676d9c4f24b7a4d2f48c4992d7485f
Component: engine
2015-05-04 15:51:56 -04:00
f81d4d4161
Merge pull request #12769 from calavera/git_build_fragment
...
Use git url fragment to specify build reference and dir context.
Upstream-commit: 0a2ccb1cb54834d3b97982f93c42671be5861082
Component: engine
2015-05-04 12:48:24 -07:00
141582c6c7
Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only is enable
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 7d371c0b470334189720840854b2d5acbb1c7909
Component: engine
2015-05-04 21:30:52 +02:00
069ce566f4
Merge pull request #12967 from runcom/add-self-to-maintainers
...
Add runcom to maintainers.people
Upstream-commit: f93cbd2448fde31a5c0a93b1faba4645c5dd00fd
Component: engine
2015-05-04 12:00:42 -07:00
204fb1504f
Merge pull request #12954 from vdemeester/11595-pkg-ioutils-coverage
...
More test on pkg/ioutils (coverage)
Upstream-commit: 87a0ca5283aa5b1c3d04cc35e1c415de6b00d323
Component: engine
2015-05-04 14:57:58 -04:00
3660faa6b0
Merge pull request #10775 from duglin/BuilderFlags
...
Add support for Dockerfile CMD options
Upstream-commit: 9c32cd1cef6bd95d6f2a32d18756d6087ad8fa0c
Component: engine
2015-05-04 11:39:09 -07:00
d48ebd70cc
Add runcom to maintainers.people
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ea6649e701cf04b90fcc4a1abb29337d99b7af70
Component: engine
2015-05-04 20:26:11 +02:00
f23ef4fe69
Add more ioutils tests.
...
Closes #11595
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 815b472a02dc0f593daee4006ce893fe17236b70
Component: engine
2015-05-04 19:56:10 +02:00
366be0f240
Merge pull request #12865 from larsks/bug/12864
...
journald log driver: use CONTAINER_ID field for container id
Upstream-commit: 0c1c2726876bdffad4e600456f07e256bc1361a1
Component: engine
2015-05-04 10:53:58 -07:00
a4975c3e58
Merge pull request #12937 from runcom/daemon-as-a-service
...
Refactor server to use daemon as the service layer in controllers
Upstream-commit: 4895a887e2e88699a07ab6fea9113a5ff13d2450
Component: engine
2015-05-04 13:03:28 -04:00
42096e6c34
Merge pull request #12939 from draghuram/history_test
...
Adding test for "GET /images/(name)/history" API.
Upstream-commit: 24bd3db0b5c3368968830f775546ccd03c86c380
Component: engine
2015-05-04 12:58:43 -04:00
85b318b6f3
Merge pull request #12936 from tianon/docker-dev
...
Rename development builds to be in the "docker-dev" repo instead of "docker"
Upstream-commit: 8ac8c2af6040c24a7c8d1f54c4374665b87e69eb
Component: engine
2015-05-04 12:55:46 -04:00
