Commit Graph

20395 Commits

Author SHA1 Message Date
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
8796f0bca2 Fix typo in the api remote reference for links
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 72a0272a62f881fefb8dea5986b865fea36113ab
Component: engine
2015-05-06 22:08:10 +02: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
a67501773d Allow download-frozen-image.sh to work on user images too
To account for "/" not working in filenames, we replace it with "_" for our temporary files (that exist only to emulate Bash 4's associative arrays in Bash 3).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: ca8fa6e46d9eb93e652e4045e418e41d635c6b51
Component: engine
2015-05-06 12:05:17 -06: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
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
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
957068c6ab ino and dev must both match for a file to be identical.
This case is triggered frequently on ZFS.

Signed-off-by: Burke Libbey <burke.libbey@shopify.com>
Upstream-commit: 03956610e588057e903288b8fb50df46c8d8f5d9
Component: engine
2015-05-05 11:06:54 -04: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
49e7e90010 Add support --net=container with --mac-address,--add-host error out
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 0e08e9aca14a4ca7142fa4649983302d93b55dab
Component: engine
2015-05-05 19:28:40 +08:00
a7bae83bd7 Refactor the code of checking conflict option with netmode.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 101f982059589cac0c8891832ac3f8069291d63a
Component: engine
2015-05-05 19:23:18 +08:00
50a36ca638 a few cleanups for client output
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 5a6db4fd44c0e05c8b185174a9aa380c9cc4f719
Component: engine
2015-05-05 15:59:17 +08:00
b0e4209f68 Added information about mailing lists
Signed-off-by: Sankar சங்கர் <sankar.curiosity@gmail.com>
Upstream-commit: c7ca73c8309a49893fa54d0c604733f4c7b3cb4a
Component: engine
2015-05-05 13:21:24 +05:30
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
0b35ae594b Verify the no-trunc option for the search operation.
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 6e8aa4e588d11735c70059a478fc0c7857cb382c
Component: engine
2015-05-05 08:51:13 +08: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
afd229a538 Add DOCKER_USERLANDPROXY test variable
Add an convenient way to switch --userland-proxy on and off in
integration tests.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 44de5fecce9dd194fade1b696e9297ac5c985754
Component: engine
2015-05-04 16:07:51 -07:00
d7e8665b03 Add --userland-proxy daemon flag
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.

Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f42348e18f73d1d775d77ac75bc96466aae56d7c
Component: engine
2015-05-04 16:07:45 -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
2a741d7980 Windows: First fix for graph\graph.go
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b30f14f06d3a6c289257cf29d2e967ba09900a1e
Component: engine
2015-05-04 15:06:51 -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
0a78638a6e Add log opts flag to pass in logging options
Signed-off-by: wlan0 <sidharthamn@gmail.com>
Upstream-commit: dca9e02b15a3757272c90ec4cf0cc2b052a25fe3
Component: engine
2015-05-04 14:39:48 -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
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