ac3e60cfb0
brew: docker-py requirement points to git repository
...
Upstream-commit: 8b26e4ea3c92748a96b90fa245ccce7c7eebb81c
Component: engine
2013-08-14 23:31:18 +02:00
7aa32c3271
Merge pull request #1509 from dotcloud/1359-tar-pkg-ref
...
Add import for dotcloud/tar to replace std tar pkg
Upstream-commit: 25d71fb01b1ffce2e6704e0c9c1bb2c80ca6053f
Component: engine
2013-08-14 11:26:49 -07:00
b1df86a40c
Merge pull request #1519 from shin-/brew-more
...
Docker-brew 0.5.2 support and memory footprint reduction
Upstream-commit: 12ffb522a6efa7f25d6b2dedb04a00440ec5ed23
Component: engine
2013-08-14 10:40:05 -07:00
604c613243
Merge pull request #1539 from fkautz/https-install-script
...
Install script should be fetched over https, not http.
Upstream-commit: 0077678844f8f0f2e4a409eb71d845d83ca7490e
Component: engine
2013-08-14 10:32:29 -07:00
d0c175d770
testing, issue #1544 : Add new docker dependencies into docker-ci
...
Upstream-commit: 49597f0f52d824967779ce26e720a5f3bab54d3e
Component: engine
2013-08-14 10:12:08 -07:00
820993826c
Install script should be fetched over https, not http.
...
Upstream-commit: 80ebff0fa49b7813205102431633baba789685fb
Component: engine
2013-08-13 22:28:41 -07:00
eee3eae225
brew: Fixed a bug with remote repository builds
...
Upstream-commit: 62c0f433fa794092fe2a795784f36fbac7b9feec
Component: engine
2013-08-14 05:05:44 +02:00
05ba2d91be
Merge pull request #1533 from dhrp/docs-ux-changes
...
Docs ux changes
Upstream-commit: 4cb57a54389e25a3803dc6c4603e330b362c4ee9
Component: engine
2013-08-13 18:03:49 -07:00
613b070b88
Merge pull request #1523 from dotcloud/docker-group-docs
...
Update docs for docker group
Upstream-commit: 2e5642452b23e6c81b0ec29f10e9e1b2de615597
Component: engine
2013-08-13 18:02:30 -07:00
ab351b68de
Merged 0.5.3 hotfix release back to master
...
Conflicts:
api.go
commands.go
network.go
Upstream-commit: 4947e32acb46051297a886c8cd2ff92a05283ab5
Component: engine
2013-08-13 23:47:29 +00:00
45e3eef148
Resolved conflict in conf.py
...
ps. also changed navigation (swapped community and getting started)
Upstream-commit: 6c87db97a629f3d7b7f6e276a515506bcca8dbb1
Component: engine
2013-08-13 16:28:24 -07:00
14d9fa64a4
Merge remote-tracking branch 'dotcloud/master' into docs-smart-changes
...
Conflicts:
docs/sources/conf.py
Upstream-commit: f127c471a15050814f8d5b97b7a768f58756afff
Component: engine
2013-08-13 16:25:58 -07:00
f97e8fc164
[docs] Some user-friendly changes to the documentation.
...
- Added parmalinks (closes #1527 )
- Changed the 'fork us on github' button to 'Edit this page on github', so people can edit quickly (closes #1532 )
- Changed the favicon
Upstream-commit: f14db4934605235bd77e9d1dc22377ca710e4c7b
Component: engine
2013-08-13 16:18:32 -07:00
d7df5fa0e4
Merge pull request #1516 from unclejack/up_hack_dockerfile_go_version_to_1.1.2
...
use Go 1.1.2 for dockerbuilder
Upstream-commit: f1cdba29373cfd1a1da9133531b50a38d0f1ebe7
Component: engine
2013-08-13 14:50:12 -07:00
d208510d93
Merge pull request #1526 from metalivedev/1522-faqupdate
...
Added information about Docker's high level tools over LXC.
Upstream-commit: 0794f0b5181a5af9687b506e4c7c43ef5538d0fd
Component: engine
2013-08-13 13:57:47 -07:00
abcb5a7554
Added information about Docker's high level tools over LXC. Formatting cleanup. Mailing list cleanup.
...
Upstream-commit: e2409ad3376baeb36d1011732f7d7b1a239320ae
Component: engine
2013-08-13 13:45:07 -07:00
acf69f10ad
Merge pull request #1501 from KSid/vagrant-dev-dockerfile
...
Install websocket library before building docker
Upstream-commit: ca92bc77982c07f8f06208bdace13862d9d40e71
Component: engine
2013-08-13 12:16:30 -07:00
fe8b556e8d
Update docs for docker group
...
Upstream-commit: e4f35dd4cf81a7f2d19a61cc8b1084c3adcc5253
Component: engine
2013-08-13 12:05:27 -07:00
49824271a4
brew: Display a clear error message when the path is invalid
...
Upstream-commit: 2cebe09924c9afea47bb1f2444ba1cd8fc423669
Component: engine
2013-08-13 20:28:15 +02:00
3d705fcda8
brew: Updated requirements
...
Upstream-commit: e5f1b6b9a4b934eab9c42d6534fe52672c018405
Component: engine
2013-08-13 20:13:39 +02:00
1b1b67104d
brew: Don't build if docker daemon can't be reached
...
Upstream-commit: 79fc90b6463d9b20391b4edd1540bc0a8e84da6f
Component: engine
2013-08-13 20:13:39 +02:00
6e12795b0e
brew: Reuse repositories when possible
...
Upstream-commit: fb7c4214ced3b0533316e3eebd90ac07fe7b2933
Component: engine
2013-08-13 20:13:39 +02:00
28a5a06a8d
Update changelog to include hostname commit
...
Upstream-commit: 5d25f3232c38d6a7ed31860948058b8ec1d95656
Component: engine
2013-08-13 17:36:24 +00:00
8b4336e30f
Fix TestEnv
...
Upstream-commit: 1a1c89556f3869baded68eb56ae20f8a7e90a708
Component: engine
2013-08-13 17:34:35 +00:00
8a3b7335fe
Add hostname to the container environment.
...
Upstream-commit: 05219d6b52d8448fdad72f89b192d61480483aff
Component: engine
2013-08-13 17:30:21 +00:00
1a2d40b29b
use Go 1.1.2 for dockerbuilder
...
Upstream-commit: e09863fedb1b2fec4672d2d1ebad29ecdb8eed1a
Component: engine
2013-08-13 19:48:30 +03:00
15696699da
remove checkIfLogged
...
Upstream-commit: 2ba1300773857273585288c79aa65f011b045b4c
Component: engine
2013-08-13 14:02:49 +00:00
eb493ee13b
fix merge issue
...
Upstream-commit: 6cb908bb823409661bfedab806da924d232bf200
Component: engine
2013-08-13 13:35:34 +00:00
7847f341c4
Bump to 0.5.3
...
Upstream-commit: c3773740d982d62c5c478d3fb27aa4494383b11b
Component: engine
2013-08-12 23:55:42 +00:00
cc86282cc7
Handle ip route showing mask-less IP addresses
...
Sometimes `ip route` will show mask-less IPs, so net.ParseCIDR will fail. If it does we check if we can net.ParseIP, and fail only if we can't.
Fixes #1214
Fixes #362
Upstream-commit: 0ca133dd7681bb3af1d1de18a5ea6ed42142a11e
Component: engine
2013-08-12 23:46:26 +00:00
8e0a4e36d7
Make sure ENV instruction within build perform a commit each time
...
Upstream-commit: 68934878f1e707b126ab754d48ff6c6eb858b37e
Component: engine
2013-08-12 23:43:53 +00:00
daa3c2ba78
Revert "docker.upstart: avoid spawning a sh process"
...
This reverts commit 24dd50490a027f01ea086eb90663d53348fa770e.
Upstream-commit: ef1d1aefa73f71296911b0f5593e46a81c1f5c55
Component: engine
2013-08-12 23:35:23 +00:00
bd75d9f136
API, issue 1471: Allow users belonging to the docker group to use the docker client
...
Upstream-commit: c015d26e96e1f6ebee2a577468c747bf3d2aeeb9
Component: engine
2013-08-12 23:33:42 +00:00
82ad117950
Merge pull request #1485 from dotcloud/1471-unixsocket-group
...
* Runtime: API, issue 1471: Use groups for socket permissions
Upstream-commit: f6760fca88b35e879d308d88eeae15fa80aa7c98
Component: engine
2013-08-12 16:21:53 -07:00
a74f9e3dd3
Add import for dotcloud/tar to replace std tar pkg
...
Upstream-commit: ec61c46bf73b8c727fe8de1982d86a1417a8a0c4
Component: engine
2013-08-12 22:42:29 +00:00
62138d17f2
Merge pull request #1508 from pborreli/typos
...
Fixed typos
Upstream-commit: 90cb66f08d139079601dbbedf1fa9706d1bf5738
Component: engine
2013-08-12 15:17:02 -07:00
fdc7c648cb
API, issue 1471: Allow users belonging to the docker group to use the docker client
...
Upstream-commit: 999a8d72492c7937aa9f826406ae40158017f766
Component: engine
2013-08-12 15:16:49 -07:00
64cd837579
Merge pull request #1504 from zaiste/docs/postgresql-service
...
docs/postgresql: PostgreSQL service on Docker example
Upstream-commit: 13acf72a3e21fe1d1515deb6a421181817822086
Component: engine
2013-08-12 14:47:19 -07:00
02df6403ea
Merge pull request #1488 from KSid/336-bash-completion
...
* Contrib: bash completion script
Upstream-commit: aa213b48a47ed7d8d331c47719325cc7fa1210ed
Component: engine
2013-08-12 11:50:25 -07:00
efc4a51c0c
Fixed typos
...
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
2013-08-12 18:53:06 +01:00
48e3692cf2
Merge pull request #1476 from dotcloud/improve_TestKillDifferentUser
...
* Tests: Improve TestKillDifferentUser to prevent timeout on buildbot
Upstream-commit: 1110bb8e9855ee58a913289d4333a5baeb72bd53
Component: engine
2013-08-12 10:23:08 -07:00
29a3aefa15
Merge pull request #1491 from titanous/gitignore-test
...
gitignore all test files
Upstream-commit: 168e2f8c498840ae3cb0d644ec692eaeaf51e280
Component: engine
2013-08-12 09:18:31 -07:00
a503d396c8
Merge pull request #1487 from titanous/maintainer-usernames
...
Add GitHub usernames to MAINTAINERS
Upstream-commit: 86ef6422f346154419ebde41ff51614f5141258b
Component: engine
2013-08-12 09:07:10 -07:00
e65d5282fa
fix/docs: ubuntu instead of base, note about root-only
...
Upstream-commit: 3af60bf37565de35643c95eae9fd4ddc863c21fc
Component: engine
2013-08-12 15:30:52 +02:00
692cd4a096
Merge pull request #1494 from KSid/typo-docs-run-command
...
* Documentation: Fix typo in docs for docker run -dns
Upstream-commit: edba1af3046665bb771636e333942b0acfa87668
Component: engine
2013-08-12 04:51:56 -07:00
77c5165eea
Merge pull request #1499 from seldo/master
...
* Documentation: Adding a reference to ps -a
Upstream-commit: 875e16c11b90d3f897aef615a31dee7db0614ec7
Component: engine
2013-08-12 04:51:17 -07:00
f87f880dcc
docs/postgresql: PostgreSQL service on Docker example
...
Upstream-commit: d52c1490753cb924aa2aeeefc92fbe7a985f4cd3
Component: engine
2013-08-12 12:03:43 +02:00
c5aa8d03ec
Install websocket library before building docker
...
Upstream-commit: def9598ed968eac934699db1b8717f852652b1ef
Component: engine
2013-08-12 05:22:33 +01:00
1c6718b33c
Adding a reference to ps -a
...
It was confusing to me as a first-time user that my docker attach command failed; I was expecting the container to run continuously, and when I couldn't attach to it, I assumed something was wrong. ps -a shows that the container still exists, which gives the user confidence to go to the next step.
Upstream-commit: 529ee848da1f1dd4b628c3396289b4bcffdbd540
Component: engine
2013-08-11 17:27:47 -07:00
8ef6c1627f
runtime: correctly detect IPv4 forwarding
...
When memory cgroup is absent, there was not attempt to detect if IPv4
forwarding was enabled and therefore, docker was printing a warning
for each command spawning a new container. The test for IPv4
forwarding was guarded by the test for memory cgroup.
Upstream-commit: 64b817a5c12545252d0cbb3d4ce1f23996bb266b
Component: engine
2013-08-11 11:52:16 +02:00
