toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,280 Commits 3 Branches 295 Tags
46ea7268163bb35acf2c72d584cd44cc212770d6
Commit Graph
7280 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
unclejack 46ea726816 Merge pull request #4968 from tianon/enhanced-check-config 
Add more color and cgroupfs hierarchy verification to check-config.sh
Upstream-commit: 65eeb0fce076f580ce5b428ed5ad68a345e0fb2d
Component: engine
 2014-04-04 04:49:05 +03:00
unclejack 878341f623 Merge pull request #5002 from crosbymichael/rhatdan-selinux 
Improve selinux label handling 
Upstream-commit: a255849129f931cf3c5c7a4bf3acba921a5b71e7
Component: engine
 2014-04-04 04:43:16 +03:00
Michael Crosby bc3cbf9f38 Merge pull request #5005 from shykes/deprecate-insert 
Deprecate 'docker insert'
Upstream-commit: 09aa28eca049320f53300f9d7ba9bc28c1033d3b
Component: engine
 2014-04-03 17:16:25 -07:00
Victor Vieux 54f8986a13 Merge pull request #5006 from vieux/remove_dirty_hack 
remove hack in version
Upstream-commit: 468cb80c5989d9dfa6210ac9d2e1d50522cca8fc
Component: engine
 2014-04-03 17:09:56 -07:00
Victor Vieux b846e60f58 remove hack in version 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: b2b9334f27e1a773b77241efa214af2e87439d3b
Component: engine
 2014-04-04 00:08:51 +00:00
Victor Vieux 7664a42a38 Merge pull request #5004 from shykes/api-unit-tests 
Replace integration tests with unit tests for the remote API
Upstream-commit: dbd1e304f57c40d0cac925727832d588d453c414
Component: engine
 2014-04-03 17:06:05 -07:00
Victor Vieux 7e7d23974d Merge pull request #5001 from shykes/deprecate-images-viz-tree 
Deprecate 'docker images --tree' and 'docker images --viz'
Upstream-commit: 9f68b934d38b8873a32c5323981bea867316259a
Component: engine
 2014-04-03 17:05:59 -07:00
Solomon Hykes 8e7c545689 api/server: convert TestGetInfo from an integration test to a unit test. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 2cb560988b111ee736c4ab22588d2091cb04075e
Component: engine
 2014-04-04 00:02:44 +00:00
Solomon Hykes 53e20d9286 engine: fix engine.Env.Encode() to stop auto-guessing types. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 76057addb255e6f14dd03c276317abc759a15a80
Component: engine
 2014-04-03 23:53:42 +00:00
Solomon Hykes 2948228586 api/server: replace an integration test with a unit test using engine mocking. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: c8f437aee0d90d4955a6aaa35f8e0b74e7ac99a3
Component: engine
 2014-04-03 23:53:39 +00:00
Solomon Hykes 96808698c3 Deprecate 'docker insert' 
'docker insert' is an old command which predates 'docker build'. We no
longer recommend using it, it is not actively maintained, and can be
replaced with the combination of 'docker build' and 'ADD'.

This removes the command from usage and documentation, and prints a
warning when it is called.

The command still works but it will be removed in a future version.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 615ac8feb27b2b3db0c06b37ecd87b710eabffef
Component: engine
 2014-04-03 23:52:09 +00:00
Victor Vieux 6cbdc82faa Merge pull request #4991 from ruphin/fix_name_typo 
Fix typo in names-generator
Upstream-commit: a278656330271647b9001ca54bc6ee1447a28715
Component: engine
 2014-04-03 16:24:14 -07:00
Goffert van Gool 9ca39a7a4b Fix typo in names-generator 
Docker-DCO-1.1-Signed-off-by: Goffert van Gool <ruphin@ruphin.net> (github: ruphin)
Upstream-commit: 6cf137860102b8df5db75dd68924375a7b74c1c3
Component: engine
 2014-04-04 00:57:43 +02:00
unclejack a3c9583ac0 Merge pull request #5000 from shykes/skip-login-tests 
Skip login tests because of external dependency to a hosted service.
Upstream-commit: 55729ab4cbce70c5d5b9b89b5e8dbe9a9ee1da6f
Component: engine
 2014-04-04 01:11:09 +03:00
Michael Crosby b78055588f Merge pull request #4993 from crosbymichael/remove-loopback-setup 
Remove loopback setup for native driver
Upstream-commit: afc56e8d6d8f53d84c4e7b090a59356ff65e8add
Component: engine
 2014-04-03 15:09:09 -07:00
Solomon Hykes 14694d6df5 Deprecate 'docker images --tree' and 'docker images --viz' 
* The commands are no longer listed or documented.
* The commands still work but print a deprecation warning.
* The commands should be removed in a future version.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 7c3b955b907c33238c1c155ae8860b2cec929c8b
Component: engine
 2014-04-03 22:03:23 +00:00
Solomon Hykes dd40df5fd3 Skip login tests because of external dependency to a hosted service. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 887eeb2b022a4c6d3de8c9bfc586ee82855d3cb9
Component: engine
 2014-04-03 21:55:33 +00:00
Guillaume J. Charmes 71d38642f5 Merge pull request #4994 from crosbymichael/remove-start-test 
Remove racy test causing tests to stall
Upstream-commit: 9e29d65aad429978cfcfde7f447cabec3c6acc0b
Component: engine
 2014-04-03 14:49:35 -07:00
Victor Vieux 20b343ea45 Merge pull request #4992 from crosbymichael/fix-mknod-test 
Fix configuration test for MKNOD
Upstream-commit: 95d07b52b3b578e514987c06bc71ed027f5b9215
Component: engine
 2014-04-03 12:21:30 -07:00
Michael Crosby 002958a112 Merge pull request #4980 from creack/update_signal_management 
Return correct exit code upon signal + SIGQUIT now quits without cleanup
Upstream-commit: 5864a3ff77f90ada7174dc047ecbde0ffe32f72c
Component: engine
 2014-04-03 11:58:19 -07:00
Kevin Wallace f4ef3606d9 Add myself to AUTHORS. 
Docker-DCO-1.1-Signed-off-by: Kevin Wallace <kevin@pentabarf.net> (github: kevinwallace)
Upstream-commit: e21607341cd8dc575098bd09a3c992da166f7884
Component: engine
 2014-04-03 18:44:13 +00:00
Kevin Wallace 42964a36b7 Allow non-privileged containers to create device nodes. 
Such nodes could already be created by importing a tarball to a container; now
they can be created from within the container itself.

This gives non-privileged containers the mknod kernel capability, and modifies
their cgroup settings to allow creation of *any* node, not just whitelisted
ones.  Use of such nodes is still controlled by the existing cgroup whitelist.

Docker-DCO-1.1-Signed-off-by: Kevin Wallace <kevin@pentabarf.net> (github: kevinwallace)
Upstream-commit: c94111b61988ad32d87f99d4421cbcde018c3fb4
Component: engine
 2014-04-03 18:44:13 +00:00
Victor Vieux 71eafab2ea Merge pull request #4989 from alexlarsson/fix-volumes-from 
Fix --volumes-from mount failure
Upstream-commit: 5844920185b11f3c1f88486774d9a129fa44c0da
Component: engine
 2014-04-03 11:27:18 -07:00
Tianon Gravi c231a5f59a Update contrib/check-config.sh cgroupfs check to allow for something like '... cgroup rw,cpu' (looking at you, boot2docker) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: fee16d42163822bb23a51c5ebcb1115efc761947
Component: engine
 2014-04-03 11:52:19 -06:00
Tianon Gravi 78e32310f2 Update contrib/check-config.sh to use zcat and grep if zgrep isn't available 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 9712f8127a9ac47a3679e20faea08fb971ee1ecc
Component: engine
 2014-04-03 11:46:24 -06:00
Alexander Larsson ba88c545d8 Fix --volumes-from mount failure 
As explained in https://github.com/dotcloud/docker/issues/4979
--volumes-from fails with ENOFILE errors.

This is because the code tries to look at the "from" volume without
ensuring that it is mounted yet. We fix this by mounting the containers
before stating in it.

Also includes a regression test.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bd94f84ded944ab69c18cf9d23c35deee3b15963
Component: engine
 2014-04-03 19:33:20 +02:00
Guillaume J. Charmes 9fb042d57e Allow force sigint and allow sigquit after sigint 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: cd910cb6858541b432e20b650fad262772c9ef18
Component: engine
 2014-04-03 10:07:42 -07:00
James Turnbull 06e40ba2fa Merge pull request #4984 from michaelneale/master 
explained what authConfig actually is
Upstream-commit: be882d989a4d1d23f05916a525cf7f8e5cf3da4b
Component: engine
 2014-04-03 09:20:24 -04:00
Sven Dowideit 83557589d6 Merge pull request #4985 from drothlis/patch-1 
docs: Fix typo in hello world example
Upstream-commit: cb824f409310c4320e15b0ef18632e5cadd17311
Component: engine
 2014-04-03 20:07:44 +10:00
Michael Neale 6d320e0c92 explained what authConfig actually is. 
Docker-DCO-1.1-Signed-off-by: Michael Neale <michael.neale@gmail.com> (github: michaelneale)
Upstream-commit: 75633a0451a98bf0c803e742625c4de27dbcc2e8
Component: engine
 2014-04-03 19:43:21 +11:00
David Röthlisberger a941fe51a8 docs: Fix typo in hello world example 
Upstream-commit: 8c4617e0ae3b9c7e5167883ca171ad8e23fc06b4
Component: engine
 2014-04-03 09:40:28 +01:00
Sven Dowideit c536ebaf82 Merge pull request #4924 from msabramo/move_installmirrors_anchor_in_docs 
Move installmirrors anchor in doc
Upstream-commit: 24e8b1b834f8e1dc4d963ec76d4f927cb41bbc2b
Component: engine
 2014-04-03 12:48:01 +10:00
Sven Dowideit 0ce7ba3626 Merge pull request #4972 from unclejack/document_a_flag 
docs: explain what docker run -a does
Upstream-commit: e8cb65b3cc9a49baa95ca0e1fd6f13f7185bdce0
Component: engine
 2014-04-03 10:23:39 +10:00
Victor Vieux c93b9fc839 Merge pull request #4953 from rhatdan/selinux 
These two patches should fix problems we see with running docker in the wild.
Upstream-commit: 9687c087ab09feb106b040628423e70b320a51e2
Component: engine
 2014-04-02 16:36:41 -07:00
Michael Crosby e8ca8d4bc2 Merge pull request #3971 from creack/fix_add_ownership 
Change ownership to root for ADD file/directory
Upstream-commit: 9cc7eb4ab37504477b2e56219cab95e65a3fbf40
Component: engine
 2014-04-02 12:22:09 -07:00
Tianon Gravi fd7060d282 Merge pull request #4965 from tianon/update-makefile 
Update Makefile with several improvements
Upstream-commit: 8aa3dc681dcc1fbbfcb71ba52661f551004d1b51
Component: engine
 2014-04-02 12:03:12 -06:00
unclejack 0636b8d97e Merge pull request #4951 from alexlarsson/dm-fix-deadlock 
Fix AB-BA deadlock in devicemapper backend
Upstream-commit: 3e68d36485a15f1688601a88440af6df59a8cea7
Component: engine
 2014-04-02 20:58:09 +03:00
unclejack 036c540e6a Merge pull request #4779 from vieux/symlink_mtab 
symlink /etc/mtab and /proc/mounts
Upstream-commit: b5caa5053a561b02e14dd26395e08351e519dae1
Component: engine
 2014-04-02 20:57:04 +03:00
Michael Crosby 7270524938 Fix lxc label handleing 
This also improves the logic around formatting the labels for selinux
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 94233a204f82f857536c16f36f94d3a8ff0069dd
Component: engine
 2014-04-02 16:52:49 +00:00
Michael Crosby f5030a0a05 Merge branch 'selinux' of https://github.com/rhatdan/docker into rhatdan-selinux 
Conflicts:
	pkg/selinux/selinux.go
	runtime/execdriver/lxc/lxc_template.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6e7a93628b924d176a9caa1164db7a1526dbe573
Component: engine
 2014-04-02 16:11:35 +00:00
Dan Walsh 7ca727547c Fix SELinux issue with missing Contexts in lxc execdriver 
There is a bug in the SELinux patch for the lxc execdriver, that
causes lxc containers to blow up whether or not SELinux is enabled.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: ca4224762b5fe9a319b6c1724ee16d1552403269
Component: engine
 2014-04-03 09:45:40 -04:00
Dan Walsh 4e1b33060b 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: d76ac4d429e474a7c79f7aab396e318f4e176025
Component: engine
 2014-04-03 09:32:29 -04:00
Dan Walsh 9870b5b4e4 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: 32ad78b0430079dcc53c245826a244afa2d9b6b6
Component: engine
 2014-04-03 09:32:29 -04:00
unclejack e3d229211f docs: explain what docker run -a does 
This adds a bit of documentation for the `-a` flag for docker run.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 63c7941172376e81c5e17206f39d7c78c0e95b69
Component: engine
 2014-04-02 16:23:01 +03:00
Michael Crosby 4f5eeb82b1 Remove racy test causing tests to stall 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a9d6eef2386a3d08840e2a30bd8d6f2ae3679688
Component: engine
 2014-04-02 13:22:51 +00:00
Michael Crosby f11e4187aa Remove loopback setup for native driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 18ef3cc24a933cbf403c2aaf8b374cfc84a722a4
Component: engine
 2014-04-02 13:12:52 +00:00
Michael Crosby e732ee3fcd Fix configuration test for MKNOD 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f80fd5da09013d7cd25a0f246ffffd7b6c064073
Component: engine
 2014-04-02 13:07:11 +00:00
James Turnbull 81aaabc5f1 Merge pull request #4966 from SvenDowideit/add-kernel-version-info 
add RHEL6 kernel version, and a 3.8 hint to the binaries doc
Upstream-commit: 440562511ee1c21548c7388b9c19fdf82c6e93a7
Component: engine
 2014-04-02 08:56:17 -04:00
Guillaume J. Charmes 0af2b8ab5b Return correct exit code upon signal + SIGQUIT now quits without cleanup 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 3b3f4bf052e442543ec5772875ce7fbc77924596
Component: engine
 2014-04-02 05:56:11 -07:00
Tianon Gravi 811da2f6bf Add more color and cgroupfs hierarchy verification to check-config.sh 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: aec989bd0801657efeeb81bafb2c6c61f60de6d4
Component: engine
 2014-04-02 02:44:12 -06:00