docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity
5,871 Commits 12 Branches 297 Tags
efeecbbbfbefb3285c1903ade7ff702ca858d73e
Commit Graph

5871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillaume J. Charmes
88636cc70a Merge pull request #17 from alexlarsson/dm-plugin-whiteout-directory 
archive.ApplyLayer() - handle directory whiteouts
Upstream-commit: 50d80a89381366001d2e888b822a139cd8eb2025
Component: engine
 2013-11-12 12:16:30 -08:00
Alexander Larsson
82914826a6 archive.ApplyLayer() - handle directory whiteouts 
When directories are white-outed we can get called with the previously
removed directories. Handle this with os.IsNotExist(error).
Upstream-commit: 6f3c32eb18f0a604ba2638b6a9f19f8824412fd1
Component: engine
 2013-11-12 21:14:54 +01:00
Guillaume J. Charmes
ce2d4b5f4c Merge pull request #21 from crosbymichael/pull-parent-layers 
Pull parent layers first before children
Upstream-commit: 0dd92d8f1cb13a0e0d6a84bb591efae1da118c71
Component: engine
 2013-11-12 11:50:20 -08:00
Michael Crosby
67a0c658d3 Pull parent layers first before children 
Upstream-commit: 7301fbe035ca450e2aea86b8f2467cffd3fac18b
Component: engine
 2013-11-12 11:48:35 -08:00
Guillaume J. Charmes
18c77ffe37 Merge pull request #20 from crosbymichael/force-driver-to-implement-differ 
Force driver to implement differ
Upstream-commit: 4ec05b5dbfa109a0812b553258158969347c79ea
Component: engine
 2013-11-12 11:48:20 -08:00
Victor Vieux
9c96f5d03b Merge pull request #2662 from dotcloud/do_not_cleanup_start_if_running 
on docker start, do not cleanup if already running
Upstream-commit: 71c05bb87c4f005ce8f87caa512d4a85896543fb
Component: engine
 2013-11-12 11:02:10 -08:00
Victor Vieux
6ba500a617 Merge pull request #2614 from dotcloud/prevent_delete_image_running_container 
Runtime: prevent deletion if image is used by a running container
Upstream-commit: 637850063c7c218db83857e5fd01c3a472094a8d
Component: engine
 2013-11-12 11:01:51 -08:00
Victor Vieux
b17fc3fb8e Merge pull request #2657 from dotcloud/fix_docker_images_output 
use utils.ParseRepositoryTag instead of strings.split in docker images
Upstream-commit: dcc9980550d46ca43878566f00d5259fce05b1ca
Component: engine
 2013-11-12 11:01:29 -08:00
Victor Vieux
89853bca87 Merge pull request #2669 from tianon/clarify-test-calls 
Add clarification of multiple "go test" calls in hack/make/*test
Upstream-commit: e40533792669bec52f696f1c68bb72fdcebbac1c
Component: engine
 2013-11-12 10:42:24 -08:00
Tianon Gravi
78d1d60f74 Add clarification of multiple "go test" calls in hack/make/*test 
Upstream-commit: 5cdb3aec507d9df7bb98366f04c4303a2172cbd5
Component: engine
 2013-11-12 11:23:06 -07:00
Victor Vieux
111d9154c1 Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert 
Conflicts:
	server.go
Upstream-commit: b314f19db8f2180292691f20f28783042b80495e
Component: engine
 2013-11-12 10:19:29 -08:00
Roberto Gandolfo Hashioka
9bdd66f858 - Improved documentation and typos fixing (Thanks to @jamtur01) 
Upstream-commit: 353243a7254705f92c3d775eec1f9cfe14fa4170
Component: engine
 2013-11-12 10:11:52 -08:00
Liang-Chi Hsieh
5ec9c64577 modify test of GetNameserversAsCIDR for its regex change. 
Upstream-commit: 879aa29cb09c641bbd510eed03647f8f85f0d559
Component: engine
 2013-11-12 18:18:30 +08:00
Michael Crosby
084cb15f1a Allow drivers to implement ApplyDiff in Differ interface 
Upstream-commit: 5d9723002bc764e2c768e5184994d7949f55fc49
Component: engine
 2013-11-11 19:09:57 -08:00
Liang-Chi Hsieh
31cff767cd fix nameserver regex. 
Upstream-commit: 1e5ba57de372bd13b0231e969dbb62a7fa8d7b52
Component: engine
 2013-11-12 10:53:34 +08:00
Victor Vieux
943cd7996b on docker start, do not cleanup if already running 
Upstream-commit: bc6d87284174c1a862603a2da574ff60bb03e0fa
Component: engine
 2013-11-11 18:15:38 -08:00
Roberto Gandolfo Hashioka
c75d132f03 - Added a doc about Links and Container Naming 
Upstream-commit: 981560c43631e1b09b6f90945d2d5e58345cabd2
Component: engine
 2013-11-11 17:38:54 -08:00
Victor Vieux
b60d444c4f Merge pull request #2527 from jpoimboe/fedora-iptables-fix 
Fix container networking on Fedora
Upstream-commit: d589cc36227702e40038704ab048efff23bc71d9
Component: engine
 2013-11-11 15:12:40 -08:00
Andy Rothfusz
1e55bfad23 Merge pull request #2621 from rogaha/rm_del_all_example 
- Added delete all the containers example (docker rm `docker ps -a -q`)
Upstream-commit: 69a9614cb4654616baf9fb849275d6ec74a13a33
Component: engine
 2013-11-11 14:55:50 -08:00
Victor Vieux
b55bba158e add wait, stop, start, restart, rm, rmi 
Upstream-commit: e2ac0e6b806c094fd8a3b706653623c0c2aee861
Component: engine
 2013-11-11 14:47:23 -08:00
Michael Crosby
b93991acb1 Add ability to exclude files from tar 
Upstream-commit: 2c7f50a77dc281289387008b4a08656e7e5328be
Component: engine
 2013-11-11 14:30:38 -08:00
Solomon Hykes
e57467c180 Change crypto export notice to meet Debian requirements 
Upstream-commit: 01dd7e74592b7b45c56d1187e7dcfaac39e67be1
Component: engine
 2013-11-11 22:08:37 +00:00
Victor Vieux
a30846b548 use utils.ParseRepositoryTag instead of strings.split in docker images 
Upstream-commit: 84a3600ea82d1a3ea235f1193092206c1f0c011a
Component: engine
 2013-11-11 13:54:17 -08:00
Andy Rothfusz
30fca0b017 Merge pull request #2646 from fgrehm/contrib-vagrant 
Update contrib/vagrant-docker with projects available
Upstream-commit: cb9e0aee485ea5b244cd1153644e7c558cd4b9a7
Component: engine
 2013-11-11 13:49:15 -08:00
Andy Rothfusz
23b6b1b409 Merge pull request #2641 from artagnon/master 
CONTRIBUTING: wrap a couple of long lines
Upstream-commit: 52d3137713c3083c28676c020bf90e95c6d44d03
Component: engine
 2013-11-11 13:43:30 -08:00
Victor Vieux
6a146241db Merge branch 'master' of https://github.com/zilin/docker into zilin-master 
Conflicts:
	container.go
Upstream-commit: 4c7d24bc8b4bf436ba72d98089767e72a8f3f960
Component: engine
 2013-11-11 12:59:18 -08:00
Victor Vieux
abd8707658 Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid 
Server: always return long id's
Upstream-commit: 87c8437a900e683547278fcdd92de71ed8a866e3
Component: engine
 2013-11-11 13:06:19 -08:00
Daniel Mizyrycki
846d1113e1 Merge pull request #2313 from wazboy/master 
Vagrant AWS update
Upstream-commit: 6fab249b21a2555f58c4de468f1f63bb284dc021
Component: engine
 2013-11-11 13:01:20 -08:00
Victor Vieux
fac387b017 Merge branch 'master' of https://github.com/aanand/docker into aanand-master 
Upstream-commit: da24945070e305e09d4d96d1f981614eaa18b01f
Component: engine
 2013-11-11 12:34:16 -08:00
Michael Crosby
86d455035f Remove Differ and Changer interfaces 
Add the methods to the Driver interface
to force the drivers to implement the methods
Upstream-commit: 4d1a537433ede2bbc75b0a4817e8121f9e03fd86
Component: engine
 2013-11-11 12:10:53 -08:00
Tianon Gravi
223e45f83c Merge pull request #2613 from tianon/ubuntu-fpm-tweaks 
Update ubuntu packaging script, especially to stop docker group deletion
Upstream-commit: ca113bb1b2403c73281911700959236e6cea1e4d
Component: engine
 2013-11-11 12:01:40 -08:00
Andy Rothfusz
ae06d51230 Merge pull request #2630 from jamtur01/api_status 
Added status column to API client table
Upstream-commit: 9ff36cb00c3b25971ca626cf8ad227822b05a798
Component: engine
 2013-11-11 11:56:04 -08:00
Mark Allen
29829cd5d2 Just return the id; nothing else. 
Upstream-commit: 62f873aa1f918fe4d303f6168f66d057e6776b18
Component: engine
 2013-11-11 13:26:24 -06:00
Tianon Gravi
d05cf98cbd Merge pull request #2653 from tianon/sysvinit-upstart-check 
Update upstart check in sysvinit to be exactly the same as the init_is_upstart function
Upstream-commit: 2091b59721e67fb96fba2fe5c795e827be832722
Component: engine
 2013-11-11 11:00:07 -08:00
Tianon Gravi
10393910ab Update upstart check in sysvinit to be exactly the same as the init_is_upstart function from /lib/lsb/init-functions (which isn't available in 12.04 or we'd use it directly) 
Upstream-commit: 88edba7e86efc8d7e118a9863ab701f0b5493d62
Component: engine
 2013-11-11 11:57:25 -07:00
Solomon Hykes
675c173a12 Hack: set NONUKE environment variable to run the tests without cleanup, to investigate temp directories 
Upstream-commit: ec6fe9f2007a0400a441b79c89bced5727589ba9
Component: engine
 2013-11-11 18:56:21 +00:00
Tianon Gravi
62719e2bfe Merge pull request #2651 from tianon/fix-sysvinit-upstart-logic 
Fix sysvinit upstart detection and give it a pretty message
Upstream-commit: 5fe4c9a39a50f46842504234dd487a4c6c5d2d1e
Component: engine
 2013-11-11 10:39:51 -08:00
Michael Crosby
4a3b02d57d Merge pull request #2633 from danderson/2598-fix-iptables-anydest 
Correctly express "any address" to iptables.
Upstream-commit: 2fc0084f6b27f2a333e40cc74e50eb68490c2c4a
Component: engine
 2013-11-11 10:22:02 -08:00
Tianon Gravi
97bc55ee5d Add /etc/default/docker support to upstart, too (mirroring sysvinit) 
Upstream-commit: 7cf7dda87d59981f8a1727725f6d914dcc4c1815
Component: engine
 2013-11-11 11:13:16 -07:00
Tianon Gravi
60cd8ebc40 Fix sysvinit upstart detection and give it a pretty message 
Upstream-commit: bb76157d240ae871bc3d9b6a945a982abf0473c7
Component: engine
 2013-11-11 11:10:19 -07:00
Solomon Hykes
dfe224141f Merge pull request #19 from alexlarsson/dm-plugin-Diff-fallback 
Implement fallback operation for driver.Diff()
Upstream-commit: e87c3ea34243eb398364927d93ef27ee560e5601
Component: engine
 2013-11-11 10:09:12 -08:00
Andy Rothfusz
0d32d7f5f1 Merge pull request #2574 from crosbymichael/api-port-changes 
Update documentation to reflect changes in Config and HostConfig
Upstream-commit: 1d9139bb890667fcd437a7316d2ff1b9a41dc250
Component: engine
 2013-11-11 09:59:48 -08:00
Guillaume J. Charmes
a52e1003c4 Make sure docker kill exit with failure in case of error 
Upstream-commit: 8149439d956489a551f9e197ca2adbae85e78ff0
Component: engine
 2013-11-11 09:15:51 -08:00
Guillaume J. Charmes
504a744b38 Fix formatting in tests 
Upstream-commit: 402a58a75a5b9813c889bf6c030bb756f86e56d4
Component: engine
 2013-11-11 09:05:38 -08:00
Alexander Larsson
122fd6b9c2 Implement fallback operation for driver.Diff() 
This moves the Diff() operation to a separate Differ interface and
implements a fallback that uses the Changes() results to encode
a diff tar.
Upstream-commit: e82f8c1661f3fa18e4dc6ca3aebe4dcc46e8961b
Component: engine
 2013-11-11 17:46:07 +01:00
Fabio Rehm
f7888fafe9 Update contrib/vagrant-docker with projects available 
Upstream-commit: 9c7a8edddd447e64069f0cd108bee4d008049c49
Component: engine
 2013-11-11 13:36:44 -02:00
Alexander Larsson
d30197ef54 archive.ChagesDir() - faster and better implementation 
This replaces the current version with the latest version from the
dm branch. Advantages in this version:

We only scan each directory tree once, which means less i/o and less chance
of container changes inbetween the two scans causing inconsistencies.

We avoid comparing some fields for change detection:

* Inode
* size-in-blocks
  These can change during a copy operation (e.g. in the dummy backend)
  without needing to actually reflect a change in content or metadata.

* Ctime
  Any copy operation will create a new Ctime value, and there is no
  API to change it to the "source" value.

* size for directories
  The size of a directory doesn't have to be the same just because you
  recreated the same content as another director. Internal details in
  the filesystem may make these different with no "real" change.
Upstream-commit: b6ef4bc9521346dc5066d71821c6cadfbeced9d3
Component: engine
 2013-11-11 14:51:19 +01:00
Alexander Larsson
8f13be5bb1 Remove devicemapper lazy initialization 
We now always initialize devicemapper on startup, so
no need for the code that did lazy initialization, we
just delete it.
Upstream-commit: b5795749d1688f99df422dd7068b189e5b25e5e9
Component: engine
 2013-11-11 13:29:27 +01:00
Ramkumar Ramachandra
8c7ea81910 CONTRIBUTING: wrap a couple of long lines 
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Upstream-commit: cf30b85eb1d3ecbf27c35ea344a5f68934c1bd2b
Component: engine
 2013-11-11 16:21:34 +05:30
Galen Sampson
ab0419261e Vagrantfile updates. 
- Remove the overrides config.vm.box and config.vm.box_url and use
  the same values for all providers.
- Use the same private key path for all providers.  It is still possible
  to set a different private key path through the environment variable
  SSH_PRIVKEY_PATH if desired (your AWS key may be different from your
  Virtualbox key).
- Allow the environment variable AWS_INSTANCE_TYPE to specify the
  instance type of instead of hard coding the AWS instance type as
  't1.micro'.  't1.micro' is still the default if unspecified.
- Use the same environment variables for keys as the Amazon provided EC2
  API tools.  This allows people who already have the EC2 tools set up
  correctly to use 'vagrant up' with less environment configuration
  than before.
- Rewrite the provisioning code.  The goal is to be idempotent and to
  correctly install docker for all providers instead of just virtualbox.
  It will conditionally install the virtualbox guest additions if
  virtualbox is the provider.
- Update the AWS install documentation to reflect the changes.
Upstream-commit: ccbb5d34927dc1905984bead3ebb576c0ea20960
Component: engine
 2013-11-10 23:39:26 -08:00