toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,409 Commits 3 Branches 295 Tags
74f0d78beb2dc68ea7ca19df996bf95a6f625f81
Commit Graph
7409 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent Batts 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
Michael Crosby 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
unclejack 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
unclejack 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
unclejack 5efea63d21 Merge pull request #4752 from crosbymichael/fix-volumes-from-files 
Allow volumes from to be individual files
Upstream-commit: b936f4f5e1df450cf220f9e14f610a38ebfd6de0
Component: engine
 2014-03-31 21:07:05 +03:00
Tianon Gravi b8be547acb Add "test-integration-cli" to our DEFAULT_BUNDLES list (make all) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 2543912e7b5593722a6a22b9ceb6a23f6268e397
Component: engine
 2014-03-31 11:55:55 -06:00
Guillaume J. Charmes fc43e586d9 Fix expending buffer in StdCopy 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: e4aaacc2351d2e1dd4b69afeeee2aeab9c625efe
Component: engine
 2014-03-31 10:54:06 -07:00
Johannes 'fish' Ziemke 2bae51a862 Add more women 
Added Adele Goldstine, Erna Schneider Hoover, Grace Hopper, Jean Bartik,
Jean E. Sammet, Karen Spärck Jones, Radia Perlman and Sophie Wilson.

Thanks to @jamtur01 for Sophie Kowalevski, Hypatia, Jane Goodall, Maria
Mayer, Rosalind Franklin, Gertrude Elion, Elizabeth Blackwell,
Marie-Jeanne de Lalande, Maria Kirch, Maria Ardinghelli, Jane Colden,
June Almeida, Mary Leakey, Lise Meitner, Johanna Mestorf.

Thanks to @xamebax for Françoise Barré-Sinoussi, Rachel Carson, Barbara
McClintock, Ada Yonath.

Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
Upstream-commit: 7808886744595af509b7b144890900674ea5ccfd
Component: engine
 2014-03-31 19:44:57 +02:00
Michael Crosby 38d0326791 Add integration test for volumes-from as file 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 28015f8e579e7bbe396f65b3343188ca03b06cbd
Component: engine
 2014-03-31 17:42:34 +00:00
Michael Crosby cbbfe30c09 Allow volumes from to be individual files 
Fixes #4741
Right now volumes from expected a dir and not a file so when the drivers
 tried to do the bind mount, the destination was a dir, not a file so it
 fails to run.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a57900e35f2c30026a070fdfdbdb0ce99b35e1ff
Component: engine
 2014-03-31 17:27:38 +00:00
Michael Crosby cacd6c31a1 Merge pull request #4505 from unclejack/cli_integration_tests 
cli integration tests
Upstream-commit: 7727c817fb5288f0b9d45ca0a4a37afa2e5329e2
Component: engine
 2014-03-31 10:26:38 -07:00
unclejack 837e04c143 Merge pull request #4922 from creack/reduce_error_lvl 
Reduce error level form harmless errors
Upstream-commit: 883649ffe7a375906d3ecb2b7df4ced5cf129f00
Component: engine
 2014-03-31 20:05:25 +03:00
Guillaume J. Charmes a21def5c37 Reduce error level form harmless errors 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: a2487aa683dc84938eb94c1ae29f8160d09441ea
Component: engine
 2014-03-31 09:07:56 -07:00
Dan Walsh f8b0436ea5 Merge branch 'master' of github.com:dotcloud/docker 
Upstream-commit: 6899b05236fd06082fb630eb16fb9a3658fa8a97
Component: engine
 2014-03-31 10:09:27 -04:00
Sven Dowideit fc67adacc9 OSX mktemp is different - hopfully this will now work on HP/UX >:} 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 04d1e686398fff0784a47cb85c37db629d40f5b5
Component: engine
 2014-03-31 11:05:21 +10:00
Sven Dowideit a6c72fd1d9 Merge pull request #4900 from WarheadsSE/fix-bip-docs 
Fix daemon's documentation for -bip flag
Upstream-commit: c8ae307bab1d0acb109fcbd4aea220a9ba3e03ca
Component: engine
 2014-03-30 10:38:36 +10:00
Sven Dowideit e6fb80c434 Merge pull request #4887 from jameshfisher/nat 
Add missing port NAT configuration
Upstream-commit: eaf2dd08394fdf4ddb934d59fb8163125aee50d8
Component: engine
 2014-03-30 10:28:59 +10:00
Tianon Gravi 466e144973 Small tweaks to the hack scripts to make them simpler 
Please do with this as you please (including rebasing and/or squashing it), especially under clause (c) of the DCO.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3fb1fc0b7b225295b3059cb9a2f5fd9af7a73f36
Component: engine
 2014-03-29 23:09:45 +02:00
unclejack 624997be0f initial version of cli integration tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 6db32fdefdae49843ed9535b3af1099e6bd2755d
Component: engine
 2014-03-29 23:09:40 +02:00
Solomon Hykes c91d38cde3 Steve Wozniak is not boring. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 04f5c75239cba156db70523bcd90657e5c7b5ddb
Component: engine
 2014-03-29 00:48:47 +00:00
Victor Vieux 9b7d158e2c Merge pull request #4884 from rhatdan/remount-var-lib-docker 
Remount /var/lib/docker as --private to fix scaling issue
Upstream-commit: c705e4a80bd93fac7af38f5384ca61cb884bd22f
Component: engine
 2014-03-28 17:15:32 -07:00
Jason Plum 0b1efc836d Fix daemon's documentation for -bip flag 
Upstream-commit: 36dfa0c4ec90404f76a6ec73c89d199e279ee96c
Component: engine
 2014-03-28 18:02:17 -04:00
James Turnbull 1647b890f4 Merge pull request #4862 from jsimonelis/dockerfile_reference_typofix 
documentation typo fix -- Dockerfile reference
Upstream-commit: 058cc8818a44fab83f5274397de223f36e6910db
Component: engine
 2014-03-28 16:18:45 -04:00
Justin Simonelis de2c049dbe Update AUTHORS 
Upstream-commit: 7d750180e49159ead712843a9cc1c0c58fd5c53c
Component: engine
 2014-03-28 15:15:54 -05:00
Victor Vieux 29e5fe2708 Merge pull request #4836 from atlassian/master 
Use environmental proxy when doing a ping to the remote repo
Upstream-commit: e13b4fd869c4f6065267acd99957fcec33349212
Component: engine
 2014-03-28 10:24:16 -07:00
Michael Crosby 20901d954f Merge pull request #4895 from alexlarsson/dm-clean-shutdown 
devmapper: Ensure we shut down thin pool cleanly.
Upstream-commit: 755cd482588c0e07c4e6c4d123fc82a62bf64a01
Component: engine
 2014-03-28 09:49:04 -07:00
Alexander Larsson 8d7581c203 devmapper: Ensure we shut down thin pool cleanly. 
The change in commit a9fa1a13c3b0a654a96be01ff7ec19e8009b2094
made us only deactivate devices that were mounted. Unfortunately
this made us not deactivate the base device. Which caused
us to not be able to deactivate the pool.

This fixes that by always just deactivating the base device.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 66c5e19f9bd057644fab475499ea45bb428ba2b2
Component: engine
 2014-03-28 15:58:14 +01:00
Dan Walsh 6d04587343 Remount /var/lib/docker as --private to fix scaling issue 
If an admin mounts all file systems as -rshared (Default on RHEL and Fedora)
we see a scaling problem as the number of container increase.

Basically every new container needs to have it new mounts in /var/lib/docker
shared to all other containers, this ends up with us only able to scale to
around 100 containers, before the system slows down.

By simply bind mounting /var/lib/docker on its and then setting it private,
the scaling issue goes away.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 792bb41e524615486ef8266b7bf4804b4fe178f1
Component: engine
 2014-03-28 09:19:21 -04:00
unclejack 8972e580e1 Merge pull request #4759 from crosbymichael/comments-in-buildfile 
Strip comments before parsing line continuations
Upstream-commit: 5b9c8607d90c20282eb65b75112f09634bcba277
Component: engine
 2014-03-28 11:16:32 +02:00
unclejack 1861c25cbb Merge pull request #4880 from tianon/ignore-down-interfaces 
Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
Upstream-commit: 10b7ae39b95d3b4455616e35b407895ebdd55e06
Component: engine
 2014-03-28 10:54:11 +02:00
unclejack 1e8741dfed Merge pull request #4889 from crosbymichael/fix-commit-validation 
Fix commit and import when no repository is specified
Upstream-commit: 0fb8146afa6001da0673f4178d73a6545aaa8ad2
Component: engine
 2014-03-28 10:25:21 +02:00
Victor Vieux ae0da14a77 Merge pull request #4442 from ibuildthecloud/hairpin-nat 
Support hairpin NAT without going through docker server
Upstream-commit: d2327006d659595e88da653e054f826401b05727
Component: engine
 2014-03-27 18:09:42 -07:00
unclejack da6de365f6 Merge pull request #4450 from alexlarsson/cgroups-systemd 
Add systemd implementation of cgroups
Upstream-commit: 69ba31e17ea4dab6b040478720955dece5986f6c
Component: engine
 2014-03-28 03:05:02 +02:00
James Harrison Fisher 1bc1caf27c Add missing port NAT configuration 
Missing port translation causes last line to fail

Docker-DCO-1.1-Signed-off-by: James Fisher <jameshfisher@gmail.com> (github: jameshfisher)
Upstream-commit: 64dd77fa0eb73ec4f395848982ccb60bb3bf8fc5
Component: engine
 2014-03-27 23:02:44 +00:00
Guillaume J. Charmes 85082e995b Merge pull request #4873 from crosbymichael/add-internal-symlinks 
Follow symlinks inside container root for build's ADD
Upstream-commit: 45b43d85ecbffb7aa626c47ef086f09463d8f8f6
Component: engine
 2014-03-27 15:46:48 -07:00
Guillaume J. Charmes 528335a67b Merge pull request #4871 from crosbymichael/bip-exists 
Return error when existing bridge does not match ip
Upstream-commit: d848e2d113a6978a42cd5bb93fe57f9ea653b627
Component: engine
 2014-03-27 14:51:21 -07:00
Alexander Larsson 5f846085d9 cgroups: Add systemd implementation of cgroups 
This implements cgroup.Apply() using the systemd apis.
We create a transient unit called "docker-$id.scope" that contains
the container processes. We also have a way to set unit specific
properties, currently only defining the Slice to put the
scope in.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 6c7835050e53b733181ddfca6152c358fd625400
Component: engine
 2014-03-27 22:44:31 +01:00
Alexander Larsson a2c3f01761 Add systemd.SdBooted() 
This is a conversion of sd_booted() from libsystemd to go and checks
if the system was booted with systemd.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 1296d5ce9ad43d8d833f6e5661da45aef6d4c26b
Component: engine
 2014-03-27 22:44:31 +01:00
Alexander Larsson 931e59cc5b pkg/systemd: Drop our copy-pasted version of go-systemd/activation 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: cb43fd007133fc05b6bb2b0d3d58fef8b1e60537
Component: engine
 2014-03-27 22:44:31 +01:00