45bf7e9540
Update test to reallocate port
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 6b7cfc9e95af8510abc801a02cda7879e4f82518
Component: engine
2014-04-01 07:27:34 +00:00
f2838447fa
Merge pull request #4949 from tjmehta/4908-fix_dynamic_port_allocation_limit
...
Fix dynamic port allocation limit
Upstream-commit: 7462cc6479c3a5c2f572bf9fe2bfc60a4f1e2506
Component: engine
2014-04-01 13:49:21 -07:00
b924033920
Merge pull request #4833 from crosbymichael/pluginflag
...
Add opts flag for fine grained control over drivers
Upstream-commit: b4b87413d8d3fd20073975bcc84603fa7853d316
Component: engine
2014-04-01 13:34:08 -07:00
9d14eab3c2
Merge pull request #4956 from tianon/sig
...
Simplify the kill "SIG" prefix stripping code
Upstream-commit: 31787233411ee1af9b396f72f0e4b41af6421690
Component: engine
2014-04-01 13:10:16 -07:00
91f0b97e4d
Merge pull request #4948 from creack/push_single_tag
...
Allow push of a single tag
Upstream-commit: e175a55eb9f0fe78d42559a716c7f69c707d7f87
Component: engine
2014-04-01 12:54:15 -07:00
d6578971c5
Simplify the kill "SIG" prefix stripping code
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 4bf70317ed3c2467f444eac9b7865b170da6366c
Component: engine
2014-04-01 13:33:46 -06:00
bf0258224f
Merge pull request #4947 from tianon/sig
...
Allow "SIG" prefix on signal names in `docker kill` ("SIGKILL", etc)
Upstream-commit: 7ab66fa694c4be384588cfc2e6c975d325977024
Component: engine
2014-04-01 11:59:44 -07:00
50a11c7c6a
Merge pull request #4945 from samalba/fix-checksum-layer
...
Fix checksum layer
Upstream-commit: b01c3a8b6c0ad61c6dcd962b7a703b30f3498c28
Component: engine
2014-04-01 11:31:59 -07:00
99eaa02040
Update docs. Make PULL up to date, remove deprecated falg and update PUSH
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: b8d660d946c5f0be3a4f01867b11f26a4f303293
Component: engine
2014-04-01 11:17:54 -07:00
8ea420dc44
Merge pull request #4920 from discordianfish/we-need-more-women
...
Improve gender equality
Upstream-commit: 1aa976aca9c795408591e59e2832a27a61af108f
Component: engine
2014-04-01 11:15:34 -07:00
4c0f7fbffc
Merge pull request #4916 from creack/no_error_start_twice
...
Don't error when trying to start a running container
Upstream-commit: 249a5ddfebfb877a88f6b7b9838f6b3e2d88f724
Component: engine
2014-04-01 10:45:31 -07:00
a2ee3725a5
Update test to be consistent
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 7a50f03fa69fb81c27d361333fadbc9cccdd8948
Component: engine
2014-04-01 10:27:10 -07:00
9f401b129b
Minor cleanup
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: cff5f0357ea35245ac906a0326863ac1f8c47c61
Component: engine
2014-04-01 10:27:05 -07:00
e4f0a4813f
Do not error when trying to start a started container
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: a03f83e3370f3859ebff172d504cc29817863b17
Component: engine
2014-04-01 10:26:53 -07:00
e80bf0c7c4
Allow "SIG" prefix on signal names in docker kill ("SIGKILL", etc)
...
This way, we can use both `docker kill -s INT some_container` and `docker kill -s SIGINT some_container` and both will do nice things for us. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 4cb602afa0a905ceb0cccf49fe142c1c7b62087b
Component: engine
2014-04-01 11:01:07 -06:00
55841b2181
Merge pull request #4904 from creack/make_dev
...
Add "BINDDIR" variable to facilitate having a shell with the full source tree bind-mounted
Upstream-commit: 527bb5e9602fdcd78e4bad99d9a56300d830e6af
Component: engine
2014-04-01 10:19:56 -06:00
d65f1f9f12
Add $BINDIR to allow mounting the whole sources if needed (for development)
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: bd24eb07b6c3a9448d8b4a8b3ab0d9cd60995aaa
Component: engine
2014-04-01 09:01:27 -07:00
0595bffeac
Update imports to be consistent
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 40c6d00c97c737d9d3827f159518007803affcc7
Component: engine
2014-04-01 07:07:42 +00:00
69f1eddd56
make findNextPort circular, add all-ports-allocated error
...
Docker-DCO-1.1-Signed-off-by: Tejesh Mehta <tejesh.mehta@gmail.com > (github: tjmehta)
Upstream-commit: 739d1244807bc3522a0af4dc3490305d6f037601
Component: engine
2014-03-31 22:21:52 -07:00
9ef93e6d75
Allow push of a single tag
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: e648a186d68dcb3ee0d6123b041c5aa66438cc89
Component: engine
2014-03-31 18:50:10 -07:00
72f522b288
Payload checksum now match the checksum simple
...
Backported for backward compatibility.
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com > (github: samalba)
Upstream-commit: de9fba71721f71f86d53cf94504b10dcea80a5bd
Component: engine
2014-03-31 18:31:15 -07:00
9681336973
Inverted layer checksum and tarsum.
...
The checksum of the payload has to be computed on the Gzip'ed content.
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com > (github: samalba)
Upstream-commit: 3f0886c8c3084341e9ef454bf41445cfc22efca2
Component: engine
2014-03-31 17:56:25 -07:00
3edb80395b
Ensure secound part of the key is provided
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7a7f59210d5eb7a38a5fac8889010bd54576ea01
Component: engine
2014-03-31 23:12:08 +00:00
1b87e1127a
Merge pull request #4929 from crosbymichael/volume-abs-path
...
Force abs paths for host volumes
Upstream-commit: f6f059d99af2d4ff7f6049221608b4fe9b82bf6a
Component: engine
2014-03-31 15:19:30 -07:00
c2da88e90a
Merge pull request #4925 from creack/fix_logs
...
Fix expending buffer in StdCopy
Upstream-commit: e76113be6c8a07f276a4bdc0d6ae043d6bc3a17e
Component: engine
2014-03-31 23:15:07 +03:00
d5407b1cee
Merge pull request #4930 from vieux/fix_regression_import
...
Fix regression import
Upstream-commit: cd0a907325153b985f8090c0e79c7f3cedfb4537
Component: engine
2014-03-31 23:12:39 +03:00
78874b1098
Add regression test
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 5fb28eab3e670f225019174987424be31a0d0527
Component: engine
2014-03-31 13:12:22 -07:00
baf4b5ebbb
Merge pull request #4881 from barnybug/fish-completions
...
Update fish completions for docker 0.9.1
Upstream-commit: 6ed2aa1db4b36bf01427f90e55ca37aea203f392
Component: engine
2014-03-31 13:57:00 -06:00
0bfaa6adaf
Merge pull request #4927 from crosbymichael/start-hang
...
Make sure to set error reguardless of attach or stdin
Upstream-commit: 5b98b70f292d34f662ea15db090906ad9bbe7ae4
Component: engine
2014-03-31 12:56:38 -07:00
99b81e3c36
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b430f4f45be27b9565027b5c89b2506577027e88
Component: engine
2014-03-31 19:31:21 +00:00
bf6fa221d1
fix import display
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 9709c31d1b500fb7cfdb02aaf62c7d8c187874cf
Component: engine
2014-03-31 19:21:57 +00:00
91181125c8
Force abs paths for host volumes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 904bf049c1626567ee28a21bde4b68ab82c5ce77
Component: engine
2014-03-31 19:10:19 +00:00
8adb937258
integration-cli: pull busybox before running
...
Make sure the busybox image is ready to be used when running the cli
integration tests.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: f7ae3a1381fdc53042bebec085bb3f108bc05da3
Component: engine
2014-03-31 22:07:23 +03:00
589014cbfc
env-file: variable behavior
...
trim the front of variables. Error if there are other spaces present.
Leave the value alone.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 500c8ba4b66c35cf2c29aeb81a9392cc406835a4
Component: engine
2014-03-31 14:45:13 -04:00
7fc896339a
--env-file: simple line-delimited
...
match dock functionality, and not try to achieve shell-sourcing compatibility
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: ff4ac7441ba582c8c339b25b400c6756d9646ff1
Component: engine
2014-03-31 14:45:13 -04:00
b8d8d2a7df
env-file: remove the unneeded deprecation markup
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: d9c257732e435cecdcc1ec8452f35e7614e4713f
Component: engine
2014-03-31 14:45:13 -04:00
745a00084d
env-file: update functionality and docs
...
Multiple flags allowed. Order prescribed. Examples provided. Multiline
accounted for.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 33dde1f7288781a3a36951309f963e6040a1a0f5
Component: engine
2014-03-31 14:45:13 -04:00
a229ff052a
make the --env-file accept multiple flags
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: acf5289dddfbbd69e19714f53575eb5088c618f7
Component: engine
2014-03-31 14:45:13 -04:00
654ceecb5b
Fixing doc references to --env-file
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: bcba5246f993a74eece36aa4b25df5b5e486e15b
Component: engine
2014-03-31 14:44:32 -04:00
a99fc1d72c
go fmt
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 4e0014f582617960bad513518d292b64da866f73
Component: engine
2014-03-31 14:44:32 -04:00
d6e8571af8
--env-file instead of --envfile
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 586e6c5eb9cd21a95d4bbba051249c4b05b2011e
Component: engine
2014-03-31 14:44:32 -04:00
f552bd89e1
pkg/opts: Close the file handle
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: bfaa917a966fab1e2c92e70617320957a8d8b43b
Component: engine
2014-03-31 14:44:32 -04:00
2d9f166bda
support for docker run environment variables file
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: cd51ac92bdf1ce0a1245f5b4565995631512ba64
Component: engine
2014-03-31 14:44:32 -04:00
3205f2e595
Make sure to set error reguardless of attach or stdin
...
Fixes #3364
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 51d9a04f17d1c8c6c1a069227c1417b20283dda2
Component: engine
2014-03-31 18:33:14 +00:00
3a032ba637
Merge pull request #4901 from vieux/split_api_2_pkg
...
Split API into 2 go packages
Upstream-commit: 1805ef1cccabd3c1beccf88cec98d6a06a1c9188
Component: engine
2014-03-31 21:32:05 +03:00
e50dea8a4b
apply Reduce error level form harmless errors
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 7697aad7b0537dade1d598cca5b7b1b420fa47c9
Component: engine
2014-03-31 18:11:53 +00:00
9772d36088
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 185b040e49aa9ab74f8d9254c7ff86b2891e3708
Component: engine
2014-03-31 18:11:53 +00:00
3772f57532
split client in 2 files
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: ae9ed84fdab4db5cec663bbd2d4ba8bcad897dcc
Component: engine
2014-03-31 18:11:53 +00:00
14450304fa
split API into 2 go packages
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: a7365a6237c45ed05d96ab11f36fde35d675b462
Component: engine
2014-03-31 18:10:02 +00:00
d6a14805b0
Merge pull request #4926 from tianon/add-cli-tests-to-default-bundles
...
Add "test-integration-cli" to our DEFAULT_BUNDLES list (make all)
Upstream-commit: 25f7b3fbb7cba2ac047db0318a99896173fef0ec
Component: engine
2014-03-31 21:09:44 +03:00