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
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
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
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
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
871898eda4
Merge pull request #1483 from titanous/update-authors
...
Update AUTHORS
Upstream-commit: 940d58806c3e3d4409a7eee4859335e98139d09f
Component: engine
2013-08-10 21:16:34 -07:00
01d6467840
Fix typo in docs for docker run -dns
...
Upstream-commit: a2fb870ce30d87aa7a08cca4c2e45c4d021c99c4
Component: engine
2013-08-11 02:04:04 +01:00
44ac0a0f19
Still missed -entrypoint from 'docker run'
...
Upstream-commit: e737856a7f2c92f6cb582a12cc6f0b9fb4720d5a
Component: engine
2013-08-11 01:29:22 +01:00
7380689cdd
Clarified bash completion limitations
...
Upstream-commit: ae1909b4823e500798f224a3ea70f7faf644a2bc
Component: engine
2013-08-11 01:08:47 +01:00
11a33ac4b8
Missed -entrypoint from 'docker run' options
...
Upstream-commit: d75282eb147218bb7c6f4032e75b95a1ddd299cf
Component: engine
2013-08-11 00:57:18 +01:00
45d797043b
gitignore all test files
...
Upstream-commit: a43bae4c0b6f3ec632636be544a6816f5f62dcb0
Component: engine
2013-08-10 13:48:24 -04:00
0dd9388168
Add description and usage information
...
Upstream-commit: 91ae1358966211826818ed452f13e3e2e27ed6cc
Component: engine
2013-08-10 13:05:31 +01:00
ee79dd7602
Revert "docker.upstart: avoid spawning a sh process"
...
This reverts commit 24dd50490a027f01ea086eb90663d53348fa770e.
Upstream-commit: e3acbff2edd04c8a7211ea078b24745749021efc
Component: engine
2013-08-10 03:06:08 +00:00
dbd3da9a6b
Add initial bash completion script
...
The script can be used to auto-complete commands, image names and
container ids from within a bash prompt.
This partially resolves #336 .
Upstream-commit: d6e5c2c276de458f36034d46f7b7f0f8efd24491
Component: engine
2013-08-10 02:38:11 +01:00
33c7b64d8e
Add GitHub usernames to MAINTAINERS
...
Upstream-commit: 4dc04d7690a4d634d9afd93821bb8e78620c5f9f
Component: engine
2013-08-09 21:16:44 -04:00
85d9c3236a
Merge pull request #1484 from titanous/use-range
...
Use ranged for loop on channels
Upstream-commit: 3e12349831903a11c67a9ca40a0d566e428aa876
Component: engine
2013-08-09 18:06:12 -07:00
66d2ddf8c5
Use ranged for loop on channels
...
Upstream-commit: 7c50221de5ec1066f0f04d6db94ee9c2fef98efb
Component: engine
2013-08-09 20:42:20 -04:00
51ecc0b473
Merge pull request #1481 from titanous/fix-sprint
...
Fix typo: fmt.Sprint -> fmt.Sprintf
Upstream-commit: 3d63087f78ff2ace86d5ea0331e32418914438b8
Component: engine
2013-08-09 17:28:59 -07:00
99c7db4cc9
Update AUTHORS
...
Upstream-commit: 1408f08c40f73ccf0204334ceb44ac482c5641e9
Component: engine
2013-08-09 20:09:42 -04:00
204241346e
Fix typo: fmt.Sprint -> fmt.Sprintf
...
Upstream-commit: 3b23f02229fd3f4928934f317d41b8f497cec9a9
Component: engine
2013-08-09 19:52:05 -04:00
dd00bdcd04
Merge pull request #1479 from jpetazzo/fix-testbindmounts-typo
...
- Tests: fix typo in TestBindMounts (runContainer called without image)
Upstream-commit: fd5099c9fec49004f19d5a1200d0debfb9a365a7
Component: engine
2013-08-09 16:20:24 -07:00
ca934a037f
fix typo in TestBindMounts (runContainer called without image)
...
Upstream-commit: 68b09cbe3d0a13bd1dbcaa39a63788fe938d0ae7
Component: engine
2013-08-09 16:03:05 -07:00
cf78c6ec1e
Merge pull request #1146 from benoitc/feature/attach_ws
...
* Runtime: add websocket support to /container/<name>/attach/ws
Upstream-commit: 92cd2f5badd402e0f9738114004f0223a92f6016
Component: engine
2013-08-09 15:38:24 -07:00
42fa1cc5fa
Merge pull request #1460 from dotcloud/patch1
...
* Runtime: Mount /dev/shm as a tmpfs
Upstream-commit: 8d1cd63dfa7fddba5d4b290b1d2b59d3cd1dca48
Component: engine
2013-08-09 15:18:22 -07:00
0c080883ce
Merge pull request #1477 from kevinclark/builder-fixme
...
Only count known instructions as build steps
Upstream-commit: 2c4c10fb4ab6bb114ae0bf5ee46f41c2cf561d7c
Component: engine
2013-08-09 14:45:06 -07:00
335d59ebfb
Add myself to AUTHORS
...
Upstream-commit: 722d4e916a727716f7f7b330c8fbea4bc089d62f
Component: engine
2013-08-09 14:39:03 -07:00
4b414aab13
Only count known instructions as build steps
...
stepN is only used in the log line, so if we only produce the log line
when there's a message, it should do the right thing.
If it's *not* a valid instruction, it gets a line as well, so there's no
reason to double up.
Upstream-commit: 4ff649a4eaf5c653176d2fecbfdb6571f0d0d174
Component: engine
2013-08-09 14:38:29 -07:00
9ba4f54ab7
Merge pull request #1462 from dotcloud/fix_build_events_output
...
Fix docker build and docker events output
Upstream-commit: 25e7227c81a6010f326c4f65e4cf566223bc41b0
Component: engine
2013-08-09 12:41:18 -07:00
d8a5c45eaa
Merge pull request #1463 from jpetazzo/https-get-docker-io
...
switch from http to https for get.docker.io
Upstream-commit: 04cd0a392bcadf36356047fd722ba1ce6cacce5f
Component: engine
2013-08-09 11:26:56 -07:00
f19e3a94a2
Improve TestKillDifferentUser to prevent timeout on buildbot
...
Upstream-commit: db9d68c3e42a187a735082776b671d23651f4334
Component: engine
2013-08-09 10:50:58 -07:00
b46f1ca6a3
Merge pull request #1452 from dotcloud/improve_TestGetContainersTop
...
* Tests: Improve TestGetContainersTop so it does not rely on sleep
Upstream-commit: 55f9610cde8f4232a2f7bf84298cb1f5c27137ba
Component: engine
2013-08-09 10:28:34 -07:00
26131c8056
brew: added safeguards in script and changed default branch to 'master'
...
Upstream-commit: 6178dc7f1be0d3c90ed02e8ccbafa4d7e103508d
Component: engine
2013-08-09 16:40:28 +02:00
e19a396471
Merged 0.5.2 hotfix release back to master
...
Upstream-commit: b8f8f9d07e7142b56ddcb05d1b8c8322d1114436
Component: engine
2013-08-08 19:45:57 -07:00
c3b5f3b391
Bump to v0.5.2
...
Upstream-commit: e99a99eb6ee7257c0b11312bec33fe27cffdaaaa
Component: engine
2013-08-09 00:17:35 +00:00
d9f7dc6f82
Change daemon to listen on unix socket by default
...
Conflicts:
docs/sources/api/docker_remote_api.rst
Upstream-commit: df9712f1c8039f83497e3c647788dd697f034158
Component: engine
2013-08-09 00:16:43 +00:00
