clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-07 06:22:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,096 Commits 9 Branches 112 Tags
os-release
Commit Graph
2115 Commits
Author SHA1 Message Date
Alexander Morozov 71c1a7ea7f Merge pull request #13017 from cpuguy83/12859_fix_lxc_wait_exitcodes 
Fix LXC stop signals
 2015-05-06 11:21:44 -07:00
Brian Goff 7c574b9e9d Move ChunkedEncoding from integration 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-06 13:00:17 -04:00
Brian Goff d2c4ee37c6 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>
 2015-05-06 11:56:48 -04:00
Doug Davis 54662eae10 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>
 2015-05-05 16:08:41 -07:00
Doug Davis 08b7f30fcd 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>
 2015-05-05 15:28:42 -07:00
Arnaud Porterie e960e4bb12 Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
 2015-05-05 14:46:47 -07:00
Alexander Morozov 77266a67e0 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
 2015-05-05 09:45:24 -07:00
Lei Jitang 0e08e9aca1 Add support --net=container with --mac-address,--add-host error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-05 19:28:40 +08:00
Qiang Huang 5a6db4fd44 a few cleanups for client output 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-05 15:59:17 +08:00
Tibor Vass 91fb4d672a Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
 2015-05-04 22:28:01 -07:00
Yuan Sun 6e8aa4e588 Verify the no-trunc option for the search operation. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-05-05 08:51:13 +08:00
Arnaud Porterie 44de5fecce 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>
 2015-05-04 16:07:51 -07:00
Arnaud Porterie f42348e18f 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>
 2015-05-04 16:07:45 -07:00
Antonio Murdaca 8771cafab6 Add tests for API container delete 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-04 22:41:57 +02:00
David Calavera 0a2ccb1cb5 Merge pull request #12769 from calavera/git_build_fragment 
Use git url fragment to specify build reference and dir context.
 2015-05-04 12:48:24 -07:00
mauriyouth 7d371c0b47 Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only is enable 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-04 21:30:52 +02:00
Phil Estes 24bd3db0b5 Merge pull request #12939 from draghuram/history_test 
Adding test for "GET /images/(name)/history" API.
 2015-05-04 12:58:43 -04:00
David Calavera 49fd83a25e Use git url fragment to specify reference and dir context. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-04 09:28:06 -07:00
Brian Goff f3023a93d1 Allow pulling stats once and disconnecting. 
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.

Also adds a `--no-stream` flag to `docker stats` which does the same

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-04 10:49:13 -04:00
Yuan Sun 9eefd2c17d Verifiy status Codes 404 when no such image 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-05-04 15:39:40 +08:00
Raghuram Devarakonda aaaa8bab0c Adding test for "GET /images/(name)/history" API. 
Closes #12284.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-05-02 23:09:32 -04:00
Tianon Gravi 576985a1dc Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum! 
IT'S ABOUT TIME. 🎉

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-05-01 16:01:10 -06:00
Jessie Frazelle 1f2f3db1e3 Merge pull request #12720 from DarianAnjuhal/fix-ensure-dockerinit 
TestDiffEnsureDockerinitFilesAreIgnored is too long
 2015-05-01 14:52:34 -07:00
Antonio Murdaca 5c86f311c8 Fix TestApiImagesDelete for --net none build 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 20:49:28 +02:00
Tibor Vass 0d0b42547e Merge pull request #12771 from runcom/say-bye-to-engine 
Remove engine
 2015-04-30 12:18:16 -04:00
Brian Goff 1eb4e96f21 Merge pull request #12837 from mavenugo/integ 
A few more Integration tests to test Networking related daemon flags
 2015-04-30 11:12:43 -04:00
Daniel, Dao Quang Minh cd2b019214 sort ports mapping before allocating 
prioritize the ports with static mapping before dynamic mapping. This removes
the port conflicts when we allocate static port in the reserved range
together with dynamic ones.
When static port is allocated first, Docker will skip those when determining
free ports for dynamic ones.

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-04-30 02:18:04 +00:00
Antonio Murdaca f7e417ea5e Remove integration tests and port them to integration-cli 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02:00
Dan Walsh d0a4f310ef Merge branch 'master' of github.com:docker/docker into kill 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-04-29 15:06:47 -04:00
Madhu Venugopal 1c073ec176 Moved explicit cleanups into defered action 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 11:41:13 -07:00
Madhu Venugopal dd0666e64f Integration Tests for --icc=false & container Linking using --expose 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 10:16:31 -07:00
Madhu Venugopal ba11929ebd Integration tests for --ip daemon option 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:49 -07:00
Madhu Venugopal 0e254411b1 Integration tests for --fixed-cidr daemon config 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:42 -07:00
Madhu Venugopal 9c325c3f54 Integration tests for --bip daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:34 -07:00
Madhu Venugopal f3f5ff9d83 Integration tests for --bridge daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:25 -07:00
Antonio Murdaca 4203230cbb c.Fatal won't fail and exit test inside a goroutine, errors should be handled outside with a channel 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-29 17:02:22 +02:00
Doug Davis 534ed8c2d4 Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-29 06:20:33 -07:00
Jessie Frazelle f80300e9cf Merge pull request #12789 from LK4D4/daemon_suite 
Implement daemon suite for integration-cli
 2015-04-28 15:30:36 -07:00
David Calavera cfa3a080c6 Merge pull request #12820 from runcom/yet-another-sockRequest-refactor 
Expose whole Response struct in sockRequestRaw
 2015-04-28 13:26:30 -07:00
buddhamagnet 6fd8e485c8 add support for exclusion rules in dockerignore 
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com>
 2015-04-28 18:56:45 +01:00
Doug Davis 82daa43844 Fix for Daemon crashing when wildcards are used for COPY/ADD 
in the filename and the command itself

Closes #12267

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-27 19:09:57 -07:00
Alexander Morozov 57464c32b9 Implement daemon suite for integration-cli 
For creating and stopping test daemons automatically.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-27 15:48:29 -07:00
Phil Estes 0153edcda1 Merge pull request #12828 from tdmackey/trivial-spelling 
trivial: typo cleanup
 2015-04-27 17:05:46 -04:00
Tibor Vass 62a85fe202 Merge pull request #12794 from runcom/small-cleaning 
Small if err cleaning
 2015-04-27 17:02:27 -04:00
David Mackey 3941623fbc trivial: typo cleanup 
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
 2015-04-27 13:35:08 -07:00
Daniel Antlinger 50868b2c57 fixed TestDiffEnsureDockerinitFilesAreIgnored is too long #12672 
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at>
 2015-04-27 13:24:15 -07:00
Antonio Murdaca 844538142d Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-27 21:50:33 +02:00
Lorenzo Fontana 40779b28bb Parallelize TestEventsLimit 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
 2015-04-27 21:14:00 +02:00
Antonio Murdaca bb1c576eb3 Expose whole Response struct in sockRequestRaw 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-27 18:49:00 +02:00
Alexander Morozov 5305e675b5 Merge pull request #12809 from runcom/remove-cfatal-goroutine-attachws 
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
 2015-04-27 08:59:47 -07:00