docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +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
43ecdc208f Merge branch 'master' into race_attach-fix 
Upstream-commit: 86205540d8d28e4f070ece91712238212105ddf0
Component: engine
 2013-06-18 10:03:34 -07:00
Andy Rothfusz
26a92f3da2 Merge pull request #921 from dhrp/docs-redirects-and-fixes 
Fixes on documentation. LGTM
Upstream-commit: 702c3538a4f9dd251c27364f3511be19851f7784
Component: engine
 2013-06-18 09:58:24 -07:00
Victor Vieux
93d4798beb Merge pull request #914 from ToothlessGear/fix-version-output 
* Client: Fix docker version's git commit output
Upstream-commit: 069a7c1e99df6458868c9585aeeb1aaf642160f2
Component: engine
 2013-06-18 05:56:42 -07:00
Daniel Mizyrycki
8dbff8be16 Merge pull request #920 from dotcloud/919-packaging 
Packaging, issue 919: Bump version to 0.4.2
Upstream-commit: 2e7649beda7c820793bd46766cbc2cfeace7b168
Component: engine
 2013-06-18 01:08:03 -07:00
Sam J Sharpe
dfa9579ca2 Vagrantfile: Add support for VMWare Fusion provider 
As a user who has blown $150 on VMWare Fusion and vagrant-vmware, I
would like to use my new shiny to hack on Docker. Docker already has a
multi-provider Vagrantfile, so adding another one presents little risk.

Known Issues:

- The docker install of a new kernel breaks the Vagrant shared folder.
    - This seems to be because the VMWare hgfs module doesn't build
      against a 3.8 kernel.
    - I don't believe that shared folder support is actually in use
Upstream-commit: 8281a0fa1cea0199ab183c0925a41e79a18382dc
Component: engine
 2013-06-18 06:19:14 +01:00
Thatcher Peskens
c44c8b06a4 Fixed on documentation. 
* replaced previously removed concepts/containers and concepts/introcution by a redirect
* moved orphan index/varable to workingwiththerepository
* added favicon to the layout.html
* added redirect_home which is a http refresh redirect. It works like a 301 for google
* fixed an issue in the layout that would make it break when on small screens
Upstream-commit: 3491d7d2f11246ba4067708a3c5336ba21da4767
Component: engine
 2013-06-17 20:16:56 -07:00
Daniel Mizyrycki
797aaaf7fe Packaging, issue 919: Bump version to 0.4.2 
Upstream-commit: e664a46ff334ff9f7c8dfb438e15950e3cacf184
Component: engine
 2013-06-17 19:50:31 -07:00
Solomon Hykes
fb46f44c43 * Builder: upload progress bar 
Fix progress bar
Upstream-commit: 0809f649d356b6b8d34a03bee8447049161ea09c
Component: engine
 2013-06-17 18:49:16 -07:00
Guillaume J. Charmes
176d1b39a4 Update documentation 
Upstream-commit: 02a002d264faa7b8cdf5c68b7370c31d6794a44d
Component: engine
 2013-06-17 18:41:13 -07:00
Guillaume J. Charmes
00bc56197b * API: Add tag lookup to history command. Fixes #882 
Upstream-commit: 3bfc82257878e55141bb029390574130c3ac0530
Component: engine
 2013-06-17 18:39:30 -07:00
Guillaume J. Charmes
b0870dd8c5 Fix bug on compression detection when chunck < 10bytes 
Upstream-commit: 02c291d13be261f84cdfa1d51513bf4dba31ce72
Component: engine
 2013-06-17 18:11:58 -07:00
Marcus Farkas
3c8ee31f8a fix docker version git output 
Upstream-commit: b25bcf1a666ebef26e2acfa132fa2b72d47d0805
Component: engine
 2013-06-17 23:32:48 +00:00
Guillaume J. Charmes
18c9c45d0a - Runtime: Forbid parralel push/pull for a single image/repo. Fixes #311 
Upstream-commit: fe204e6f48eb47a1deb3553003eaf9863a66fd1a
Component: engine
 2013-06-17 16:10:00 -07:00
Guillaume J. Charmes
5a843b1afc Remove Run race condition 
Upstream-commit: 2b6ca3872883dcb487d8a39a1a8530be6a62f947
Component: engine
 2013-06-17 15:45:08 -07:00
Guillaume J. Charmes
fa0630fa0a Move the attach prevention from server to client 
Upstream-commit: c106ed32ea7613573a2081d47ad2498429ac86f2
Component: engine
 2013-06-17 15:40:04 -07:00
Joseph Anthony Pasquale Holsten
91e6023ad7 fix missing command in irc bouncer example 
Upstream-commit: 2626d88a21f639913f7f8e8b0719fd9e07cfbed4
Component: engine
 2013-06-17 14:50:58 -07:00
Guillaume J. Charmes
74ed6f1501 - Runtime: Fixes #884 enforce stdout/err sync by merging the stream 
Upstream-commit: 3a0ffbc77267e395676860db265ee3476c45b3c2
Component: engine
 2013-06-17 14:44:35 -07:00
Daniel Mizyrycki
cdeb24fafc Packaging|dockerbuilder, issue #761: use docker-golang PPA. Add Dockerfile header 
Upstream-commit: bd9bf9b646837dac5f935e43a4b950d42353676e
Component: engine
 2013-06-17 14:08:50 -07:00
Victor Vieux
e99de544ce Merge pull request #912 from dotcloud/bump_0.4.1 
Bumped version to 0.4.1
Upstream-commit: 7b6f50772cc7003fede23e74f70f8dc76b96a434
Component: engine
 2013-06-17 14:06:17 -07:00
Guillaume J. Charmes
0b3b002cd4 Merge branch 'master' into builder_server-3 
Conflicts:
	buildfile_test.go
Upstream-commit: 555552340dd07eb446e54011071a621430fd83a0
Component: engine
 2013-06-17 14:01:32 -07:00
Solomon Hykes
569fd3d92a Merge pull request #911 from dotcloud/add_port_redirection_doc 
* Documentation: add port redirection doc
Upstream-commit: 6e2c32eb9a86c65c55d9097e58a5ad5c9a950e66
Component: engine
 2013-06-17 13:57:08 -07:00
Solomon Hykes
fe13f8b67b Merge pull request #897 from dotcloud/fix-overlapping-add 
* Builder: ADD improvements: use tar for copy + automatically unpack local archives
Upstream-commit: 22b0a38df51acd9f96ae1a82f8a5b86640b5f3b5
Component: engine
 2013-06-17 13:32:34 -07:00
Solomon Hykes
00898589d5 Typo 
Upstream-commit: cb58e63fc54fb3f1c620c8372269a8e308e43bee
Component: engine
 2013-06-17 14:28:04 -06:00
Solomon Hykes
cafa9cc449 Added content to port redirect doc 
Upstream-commit: 862659875335c953bf6974af4cace397c7ec3902
Component: engine
 2013-06-17 13:25:50 -07:00
Victor Vieux
5e2d23d571 add port redirection doc 
Upstream-commit: 36231345f17e6fdb08b0f756c4872294d4745048
Component: engine
 2013-06-17 22:05:58 +02:00
Victor Vieux
434fb6f49b Bumped version to 0.4.1 
Upstream-commit: e8f001d45157f2f645e415543d7c3e7bf832c665
Component: engine
 2013-06-17 19:15:21 +00:00
Guillaume J. Charmes
74040db600 Fix the auth tests and add the offline mode 
Upstream-commit: 13e03a691145921ffc17c56db24f06eacca99a77
Component: engine
 2013-06-17 11:29:02 -07:00
Victor Vieux
5daee8b0f6 use go 1.1 cookiejar and revome ResetClient 
Upstream-commit: fde82f448f6b1508e03f419a3ce4c9b80311d466
Component: engine
 2013-06-17 18:13:40 +00:00
Guillaume J. Charmes
cec1c67f6e Merge branch 'master' into builder_server-3 
Conflicts:
	buildfile.go
Upstream-commit: 79b3265ef1f654181db4a1a85154f9735a0fac6e
Component: engine
 2013-06-17 11:09:53 -07:00
Daniel Mizyrycki
21a945c9c4 Merge pull request #887 from dotcloud/761-packaging-dockerbuilder 
Packaging, dockerbuilder: Automate pushing docker binary packages
Upstream-commit: 389db5f5987e927bf2f8f90ea536fec3a95ac1cb
Component: engine
 2013-06-17 08:40:01 -07:00
Solomon Hykes
fa4667b670 Merge branch 'master' into simpler-build-upload 
Upstream-commit: fe88b5068d125a834fe586956a69ee36000cf879
Component: engine
 2013-06-15 12:35:26 -07:00
Solomon Hykes
4015efd9be FIXMEs 
Upstream-commit: 6746c385bd7938e1bbcf588a27651de63a2de04a
Component: engine
 2013-06-15 12:24:20 -07:00
Solomon Hykes
39f9189f02 * Builder: added a regression test for #895 
Upstream-commit: f50e40008f39c77cab2b516ac2102f875bdef215
Component: engine
 2013-06-15 11:35:56 -07:00
Solomon Hykes
89a21cc6a6 * Builder: reorganized unit tests for better code reuse, and to test non-empty contexts 
Upstream-commit: 061f8d12e04e494fdcbee949facaf598d201c2ec
Component: engine
 2013-06-15 11:07:49 -07:00
Solomon Hykes
4bba5db0ac * Builder: simplify the upload of the build context. Simply stream a tarball instead of multipart upload with 4 intermediary buffers. Simpler, less memory usage, less disk usage, and faster. 
Upstream-commit: 38554fc2a722d1a77514f477a189b0dbd149691b
Component: engine
 2013-06-15 09:38:18 -07:00
Solomon Hykes
667532e025 Removed deprecated file builder_client.go 
Upstream-commit: cc7de8df755d9e4a845a8aa5800424b1546492d6
Component: engine
 2013-06-15 09:30:52 -07:00
Solomon Hykes
1cdf6869a0 Merge pull request #895 from dotcloud/build-fixes 
- Builder: fix a bug which caused builds to fail if ADD was the first command
Upstream-commit: 30f604517a5ddc15b3e9f6e9d42f4c7569c1627f
Component: engine
 2013-06-15 09:23:41 -07:00
Solomon Hykes
8e1839cf72 Fix a bug which caused builds to fail if ADD was the first command 
Upstream-commit: 080f35fe65a7bb88ccf2abefa985c7a4ae88a47b
Component: engine
 2013-06-15 09:16:35 -07:00
Guillaume J. Charmes
726da1690f Merge branch 'master' into builder_server-3 
Conflicts:
	utils/utils.go
Upstream-commit: 78f86ea502694bf5dbc947802ebc0f5e5426d15c
Component: engine
 2013-06-14 17:08:39 -07:00
Solomon Hykes
2105eec29d + Builder: ADD of a local file will detect tar archives and unpack them 
into the container instead of copying them as a regular file.

* Builder: ADD uses tar/untar for copies instead of calling 'cp -ar'.
	This is more consistent, reduces the number of dependencies, and
	fixe #896.
Upstream-commit: 5b8287617de65d4e14ed6affb0eb46867e9ee617
Component: engine
 2013-06-14 16:43:39 -07:00
Solomon Hykes
f839c4752b FIXMEs 
Upstream-commit: 5799806414b266c14a8ea2802cfa0906d920c62d
Component: engine
 2013-06-14 16:29:19 -07:00
Guillaume J. Charmes
e983ca691c Fix merge issue 
Upstream-commit: 76a568fc9717ff69999ab54fba9277a0d31c305d
Component: engine
 2013-06-14 16:08:08 -07:00
Solomon Hykes
3562ef766f Various FIXME items 
Upstream-commit: 14265d9a18a4a2151bfd4e5c7e94de45377b6375
Component: engine
 2013-06-14 15:11:34 -07:00
Solomon Hykes
158248b9fd Merge branch 'master' of ssh://github.com/dotcloud/docker 
Upstream-commit: 17235eb0893fc7f8658ed36da0ec336b2d1fca5d
Component: engine
 2013-06-14 15:07:05 -07:00
Solomon Hykes
40bdb17b30 Remove duplicate 'WARNING' 
Upstream-commit: 7f118519eb007b2423fff428aceddabd6c1c301d
Component: engine
 2013-06-14 14:46:08 -07:00
Solomon Hykes
54b69da177 Merge branch 'dns_server_side' 
+ Configure dns configuration host-wide with 'docker -d -dns'
+ Detect faulty DNS configuration and replace it with a public default
Upstream-commit: 250e47e2eb12015fd436a9b695c50cc2fbfb3fdc
Component: engine
 2013-06-14 14:39:05 -07:00
Guillaume J. Charmes
280d969b39 Merge pull request #857 from edx/856-vagrant-port-forwarding 
* Vagrantfile: Add an option to forward all ports to the vagrant host that have been ex...
Upstream-commit: f413fb8e56ae42a762222ddcf402cbaf89878e2e
Component: engine
 2013-06-14 14:37:55 -07:00
Guillaume J. Charmes
974c66090e Merge pull request #607 from dotcloud/expose_api_port_vagrant-feature 
* Vagrantfile: Add the rest api port to vagrantfile's port_forward
Upstream-commit: f0e43dcdb15a160991b923f8f0ad76929e8b1c04
Component: engine
 2013-06-14 14:35:53 -07:00
Guillaume J. Charmes
d233a440c6 Merge branch 'master' into remove_bsdtar 
Conflicts:
	docs/sources/contributing/devenvironment.rst
Upstream-commit: abf85b25085b52e19f774dc30bd87527b3295f2a
Component: engine
 2013-06-14 14:34:30 -07:00
Guillaume J. Charmes
43010d8df6 Merge pull request #892 from unclejack/validate_memory_limits 
* Runtime: validate memory limits & error out if it's less than 524288
Upstream-commit: 813771e6b79bb40d72895ec6f95cb7aa61b193fe
Component: engine
 2013-06-14 14:32:28 -07:00