Commit Graph
2141 Commits
Author SHA1 Message Date
Guillaume J. Charmes 2d59f452fa Fix issue within TestDelete. The archive is now consumed by graph functions
Upstream-commit: 42ce68894a33a7d966f8dd767aee46dea6dbc346
Component: engine
2013-06-18 17:22:32 -07:00
Guillaume J. Charmes 9ed8c4d64b Merge branch 'master' into fix_detach_eof
Conflicts:
	commands.go
Upstream-commit: c063fc02387b232bff4720a7c8aab5f799f4a073
Component: engine
2013-06-18 17:15:31 -07:00
Guillaume J. Charmes 0d4d92aeeb Merge pull request #916 from dotcloud/race_attach-fix
- Runtime: Fix race condition within Run command when attaching.
Upstream-commit: 0a9ac63a051c1808c7b8ac3ba06ed44e5b86fd4d
Component: engine
2013-06-18 17:13:38 -07:00
Guillaume J. Charmes dc08f9942c remove offline mode from auth unit tests
Upstream-commit: 6dccdd657f715c164f2fe6fc786c8274a2425f1b
Component: engine
2013-06-18 17:09:47 -07:00
Guillaume J. Charmes 61d11ddffb Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
Upstream-commit: 34a434616a7056a89328348ce3f92afd2730c777
Component: engine
2013-06-18 16:12:30 -07:00
Elias Probst 65fe379064 Use the canonical 'ip' commands to make it easier for new 'iproute2' users to understand the usage.
Upstream-commit: bc9b91e501369264966263fc28bb516e6048b7e5
Component: engine
2013-06-19 00:57:43 +02:00
Solomon Hykes 07df046233 Merge pull request #927 from dotcloud/nicer-build-output
* Builder: nicer output for 'docker build'
Upstream-commit: edbd3da33a02068cd48d4a862071f429c0d05329
Component: engine
2013-06-18 15:48:00 -07:00
Guillaume J. Charmes 2c3eeb1b3d Merge pull request #918 from dotcloud/hisotry_lookup
Add image lookup to history command
Upstream-commit: 32e8f9beca4c8a0c0b3e32b8d7ea4366067c3913
Component: engine
2013-06-18 15:36:05 -07:00
Guillaume J. Charmes 0c8eff63fa Update documentaiton
Upstream-commit: 84ceeaa8708293de81765a0f854952a74d191024
Component: engine
2013-06-18 14:36:35 -07:00
Solomon Hykes c061827960 Updated FIXME
Upstream-commit: cdeaba2acfe8e5765aaf9fec195705eb841cb857
Component: engine
2013-06-18 13:02:12 -07:00
Solomon Hykes 781a7a3216 Fix incorrect docs for 'docker build'
Upstream-commit: c0b82bd807000019674e1f939b9ee2f43e5ba518
Component: engine
2013-06-18 12:52:37 -07:00
Solomon Hykes f787ba917e Merge pull request #926 from josephholsten/fix-znc-example
- Documentation: fix missing command in irc bouncer example
Upstream-commit: 88e35b6f80977f99f8b65796c2237c66ce0d37b2
Component: engine
2013-06-18 12:37:21 -07:00
Guillaume J. Charmes 017e4a61cb Fix merge issue
Upstream-commit: 6e17cc45eabf6d094241fc3e017a90da8ba6f5d9
Component: engine
2013-06-18 12:33:06 -07:00
Solomon Hykes 4ff35be219 Nicer output for 'docker build'
Upstream-commit: cb9d0fd3bc13a381f3017d06cd057da2cd3f1c15
Component: engine
2013-06-18 12:26:56 -07:00
Victor Vieux 11334d506a add basic support for unix sockets
Upstream-commit: 3adf9ce04ef1632f82f7bd1585c135bb141aa450
Component: engine
2013-06-18 18:59:56 +00:00
Elias Probst 3fe9ccaf5e Fixed #923 by replacing the usage of 'ifconfig' with 'ip a' where appropriate and added a note to use 'ip a' instead of 'ifconfig' for a screencast transscript.
Upstream-commit: c2e95997d4c4dda9edbb4adaab8920f1b5982c25
Component: engine
2013-06-18 19:55:59 +02:00
Guillaume J. Charmes 531f894fab * API: Send all tags on History API call
Upstream-commit: 808faa6371c470fa0765f5d4e3aed7708d8f9ee6
Component: engine
2013-06-18 10:31:07 -07:00
Solomon Hykes 549a47a3dd Remove bsdtar dependency in various install scripts
Upstream-commit: 6f511ac29b1c3cf1c2424b3c39ee14a32aecb5d7
Component: engine
2013-06-18 10:23:45 -07:00
Guillaume J. Charmes ec13f22dbd Remove useless goroutine
Upstream-commit: 3dc93e390ad3d310dede84948b726ce67e261375
Component: engine
2013-06-18 10:10:03 -07:00
Guillaume J. Charmes 7bd657cfeb Remove useless goroutine
Upstream-commit: e2d034e48858d0afe9ee0f88f04e40cbf95ab8ba
Component: engine
2013-06-18 10:06:26 -07:00
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