starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-08 18:14:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
21,804 Commits 13 Branches 322 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph
21804 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux 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
Michael Crosby 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
Dan Walsh 94c4d19652 In certain cases, setting the process label will not happen. 
When the code attempts to set the ProcessLabel, it checks if SELinux Is
enabled.  We have seen a case with some of our patches where the code
is fooled by the container to think that SELinux is not enabled.  Calling
label.Init before setting up the rest of the container, tells the library that
SELinux is enabled and everything works fine.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 2224e0d65adfbd08e53430a1d7c750491f788257
Component: engine
 2014-04-01 13:30:10 -04:00
Dan Walsh 9da452cca1 Remove hard coding of SELinux labels on systems without proper selinux policy. 
If a system is configured for SELinux but does not know about docker or
containers, then we want the transitions of the policy to work.  Hard coding
the labels causes docker to break on older Fedora and RHEL systems

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: f9b8161c60f58d383ca0eaf5a99865b83e4a41b8
Component: engine
 2014-04-01 13:29:54 -04:00
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Tianon Gravi 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
Tianon Gravi 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
Guillaume J. Charmes 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
Michael Crosby 2f00c385f1 Update sig message 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ac9b06ae95f1da8407934036ab1e4019a96a6b21
Component: engine
 2014-04-01 08:18:52 +00:00
Michael Crosby 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
Michael Crosby 2ec7753394 Send sigterm and wait forever 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 93779cc7fee4ee0690d9dd28eed478a418e79577
Component: engine
 2014-04-01 07:12:50 +00:00
Michael Crosby 8169d6ecd6 Ensure state is saved to disk after we kill the ghost 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e36d89b0f9c8ba5b071374310ca632f6b2fdb7a1
Component: engine
 2014-04-01 07:12:50 +00:00
Michael Crosby d0b2920666 Don't send prctl to be consistent with other drivers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 283daced0c919be760947d44d7e46c80e1054d64
Component: engine
 2014-04-01 07:12:50 +00:00
Michael Crosby 5f13c09028 Ensure a reliable way to kill ghost containers on reboot 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5bb82f6313d7f789783ffac854be85a44a56617e
Component: engine
 2014-04-01 07:11:41 +00:00
Michael Crosby b36db3b674 Add kill for other drivers on restart 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5b9069bd990dca0a35d8e490c6f6b56d27163bb8
Component: engine
 2014-04-01 07:11:41 +00:00
Michael Crosby 357e0a3599 Ensure that all containers are stopped cleanly at shutdown 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f067e263677fc86f9610ca61fbe42f63efad91f2
Component: engine
 2014-04-01 07:11:41 +00:00
Michael Crosby 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
tjmehta 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
Guillaume J. Charmes 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
Sam Alba 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
Sam Alba 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
Victor Vieux 5505d168ef remove setupDev from libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: d52d24dd801f3ffe1b894226b8dba613de59bd87
Component: engine
 2014-04-01 00:28:44 +00:00
Michael Crosby 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
Michael Crosby a4e4b56b6e Set bridge mac addr on supported kernels 
Fixes #3200
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 4cdcea20474a9f42291fe6b6c6dee348343a7c05
Component: engine
 2014-03-31 22:56:23 +00:00
Josh Hawn 72e62c1c7b No longer expose gravatar_email in docker.io api 
Docker.io API has replaced the gravatar_email field with a
gravatar_url field instead.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 289377b409b321a5a624af3517032c396df6c22f
Component: engine
 2014-03-31 15:34:43 -07:00
Guillaume J. Charmes 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
Victor Vieux 04578891c0 symlink /etc/mtab and /proc/mounts 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 07b60d626acaddffb6a0b118bfc3f19631411d72
Component: engine
 2014-03-31 21:15:03 +00:00
unclejack 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
unclejack 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
Guillaume J. Charmes 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
Tianon Gravi 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 6ecba3e563 Merge pull request #4928 from unclejack/testscli-pull_busybox 
integration-cli: pull busybox before running
Upstream-commit: bce2464e5e0a8e3efdc28aead5e2229c88d0ccc2
Component: engine
 2014-03-31 12:16:44 -07:00
Michael Crosby 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
unclejack 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
Michael Crosby 62d94b7696 Merge pull request #4174 from vbatts/vbatts-env_file 
support for `docker run` environment variables file
Upstream-commit: b45c1061bf447358826f4551ebff79af25444139
Component: engine
 2014-03-31 12:01:14 -07:00
Marc Abramowitz 3244462f0c Move installmirrors anchor in doc 
so it's before "Mirrors" instead of "Docker and local DNS server
warnings"

Docker-DCO-1.1-Signed-off-by: Marc Abramowitz <msabramo@gmail.com> (github: msabramo)
Upstream-commit: f16372022875a6dfe9d53489bde635789dd865a6
Component: engine
 2014-03-31 11:48:57 -07:00
Vincent Batts 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
Vincent Batts 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
Vincent Batts 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
Vincent Batts 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
Vincent Batts 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
Vincent Batts 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
Vincent Batts 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
Vincent Batts 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
Vincent Batts 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