e904047138
Detect images/containers conflicts in docker inspect
...
Upstream-commit: 5ec2fea6dd3360de326717ed01909b8fe9c39d0f
Component: engine
2013-09-05 22:31:17 +00:00
236805a6b0
Merge pull request #1803 from dotcloud/1802-skip-TestGetContainersTop
...
testing, issue #1802 : Temporarily skip TestGetContainersTop
Upstream-commit: 908bb65dcf7f8a2d5e04de862e3908b46529d6a1
Component: engine
2013-09-05 14:44:47 -07:00
3306a42bfc
Merge pull request #1804 from Bouke/patch-1
...
Fix memory recommendations (Byte, not bit)
Upstream-commit: b57d7dca9de306d9372dfde6cd736aef1c4416e1
Component: engine
2013-09-05 11:52:00 -07:00
85199fa5e3
Merge pull request #1772 from dotcloud/update-tar-revision
...
Update tar pkg revision number
Upstream-commit: 8e411815915d706f69ea344ba142cb96c89650ff
Component: engine
2013-09-05 10:32:53 -07:00
caf639fe57
Fix memory recommendations (Byte, not bit)
...
Upstream-commit: fdf1fccd3eec7b534b8423fe3ea5b6e116b233fa
Component: engine
2013-09-05 10:40:11 +02:00
a096f499a1
testing, issue #1802 : Temporarily skip TestGetContainersTop
...
Upstream-commit: bf6e241d977f36db57c66a5b8dd056b36c0d8695
Component: engine
2013-09-04 18:20:49 -07:00
b0525903e4
Merge pull request #1801 from vcoisne/master
...
Add step to docker installation using vagrant (Mac, Linux)
Upstream-commit: f0cdbaa6c8810954c1e41a07ba78e03305c1cfa2
Component: engine
2013-09-04 18:15:22 -07:00
c744f81e56
Merge pull request #1789 from tommyblue/patch-1
...
Adds instruction about UDP port redirection
Upstream-commit: e0d6bae1eb2cc2991fda1a11b939dbe4a6466680
Component: engine
2013-09-04 18:14:34 -07:00
5c10539e0f
Merge pull request #1797 from denibertovic/docs
...
fixed docs for installing binary
Upstream-commit: d6ff912917f350ee728a2df419167d3b64904979
Component: engine
2013-09-04 18:13:25 -07:00
9ce0173846
Add step to docker installation using vagrant (Mac, Linux)
...
Upstream-commit: ad04cacd28da1557324b8ad6fb53b7284e8bf866
Component: engine
2013-09-04 17:47:18 -07:00
99fc9c9d22
fixed docs for installing binary
...
Upstream-commit: 62823cfb97ec35e59833fd4723c392685d55827c
Component: engine
2013-09-05 00:06:41 +02:00
f646963f0f
deployment, issue #1578 : Avoid pinning kernel headers. Add Vagrantfile assumptions
...
Upstream-commit: 8878943ac9ab3b3344d398b45e68ebb7cea879f0
Component: engine
2013-09-04 14:41:09 -07:00
8b061345d8
Merge pull request #1578 from jimmycuadra/vagrant-provider-detection
...
Better VirtualBox detection in Vagrantfile
Upstream-commit: 8e3844cd343c5939d85603505ff94ca7e48eed8f
Component: engine
2013-09-04 14:40:32 -07:00
230044d44e
Merge pull request #1795 from eliasp/patch-1
...
Typo
Upstream-commit: 1a32c4a1df0c16be16d40660bdad0fee67cfa7c6
Component: engine
2013-09-04 14:13:52 -07:00
7b3fcf5ca5
Typo
...
Upstream-commit: 396274fa6db88466fef0b1a5e314ba5b077cd3f2
Component: engine
2013-09-04 21:56:51 +02:00
1cee01680e
Don't install VirtualBox Guest Additions if VAGRANT_DEFAULT_PROVIDER is set.
...
Upstream-commit: 28e75b23b39aa0aee951378bf1039886c00f7783
Component: engine
2013-09-04 11:21:24 -07:00
a8f84352af
Adds instruction about UDP port redirection
...
Upstream-commit: ad5796de9febb5724bd2bf0639ae617c2ff34ba5
Component: engine
2013-09-04 19:17:10 +02:00
4dcb5ed317
Merge pull request #1788 from dotcloud/1787-deprecate-port-forwarding
...
deployment, issue #1787 : Remove deprecated port forwarding from /Vagrantfile
Upstream-commit: 3a6868bc2fa1e1cd76ae8691c68cb96c857ff265
Component: engine
2013-09-04 10:11:12 -07:00
61c8f585f5
deployment, issue #1787 : Remove deprecated port forwarding from /Vagrantfile
...
Upstream-commit: 34145f9840b62de85d385a65702f054962878cae
Component: engine
2013-09-04 10:05:54 -07:00
f7eb498730
Merge pull request #1784 from proger/patch-1
...
add new docker api client for erlang, erldocker
Upstream-commit: 58ea690b41b5a5fecd2cc5a44832c73ce83dd3a7
Component: engine
2013-09-04 10:01:29 -07:00
26753d6604
Merge pull request #1783 from briehanlombaard/typos
...
Fixed typos
Upstream-commit: 3b92ab34653513db3a682f96388823c8712f4ed3
Component: engine
2013-09-04 10:00:10 -07:00
8b97f99fc4
Merge pull request #1785 from thijsterlouw/update_commandline_cli
...
Fix documentation index for cli
Upstream-commit: 76f97a64faa8cbeab11334dc31d0b29a3b2d60c5
Component: engine
2013-09-04 09:59:30 -07:00
5e3e233f53
Merge pull request #1782 from tianon/gentoo-docs
...
Added Gentoo Documentation
Upstream-commit: 597479494215180cadbc62b2ffa04a6759292557
Component: engine
2013-09-04 09:58:36 -07:00
f4bdcf9337
Fix documentation index for cli
...
Upstream-commit: 368d0385e1d426a32da66135e7ff8d4f5a3c7a26
Component: engine
2013-09-04 13:21:44 +02:00
2844cc3031
add new docker api client for erlang, erldocker
...
Upstream-commit: 58ffd03bf16f41b9c954e61ef948768f44871c28
Component: engine
2013-09-04 12:53:38 +03:00
a2ac8a8fdc
Add Gentoo documentation
...
Upstream-commit: 9ce1d02ef6b0593861809248307d058656f56304
Component: engine
2013-09-04 02:59:18 -06:00
af3ae4d1fc
Fixed typos
...
Upstream-commit: 251d1261b0c2edfc8b014141cc03d32c30263226
Component: engine
2013-09-04 10:52:53 +02:00
200311a8e1
Merge pull request #1449 from spkane/honor-ENV-VAGRANT_DEFAULT_PROVIDER
...
Assume that if VAGRANT_DEFAULT_PROVIDER is set we shouldn't install vbox tools
Upstream-commit: a0a5170991fa92f03f3a01477d69fcbb435b1ea2
Component: engine
2013-09-03 17:38:03 -07:00
c7a7785d65
pr #1718 : Fetch docker gpg over https
...
Upstream-commit: 91ee67954961e9f8e5b4827022c2a3aee7997253
Component: engine
2013-09-03 17:14:49 -07:00
65eaa57cc6
Changed docker apt repo URI from https to http because the http driver for apt is not installed by default
...
Upstream-commit: 52fe45249798991a35f5a5b5a4e1af26ea42221c
Component: engine
2013-09-03 17:10:03 -07:00
a1b708cb5b
Merge pull request #1603 from dotcloud/773-docker-ci-pr
...
773 docker-ci github pull request
Upstream-commit: 0e6ee9632c9806a0c712ab140815103ebe6a66fa
Component: engine
2013-09-03 11:46:34 -07:00
0a02121daf
Update tar pkg revision number
...
Upstream-commit: ea813d8593d30e430ce05597becb1e394cb72a25
Component: engine
2013-09-03 18:30:32 +00:00
2e60ad0f9a
Merge pull request #1317 from calavera/login_signal
...
Exit from `docker login` on SIGTERM and SIGINT.
Upstream-commit: d13c2ed24edf38908400485cba82110361545ffe
Component: engine
2013-09-03 11:16:05 -07:00
28c7f36af8
Merge pull request #1758 from mattapperson/patch-1
...
Added NodeJS library
Upstream-commit: 75df4953f4dda1ea53f8aa6be86f9e46069f1d5e
Component: engine
2013-09-03 11:02:34 -07:00
d410017d2b
Merge pull request #1771 from thijsterlouw/missing_cli_docs
...
Add 2 missing cli commands to docs (events + insert)
Upstream-commit: f703b8b839ddf6cd06d8de83e55d1b6fc61fe807
Component: engine
2013-09-03 10:41:05 -07:00
a2a878343d
Add 2 missing cli commands to docs (events + insert) and alphabetically order docker output
...
Upstream-commit: 6380b42edbf98dec3b04b3b74fcfbfd63dba4034
Component: engine
2013-09-03 16:35:22 +02:00
9747a3f3df
Read the stdin line properly.
...
Load the auth config before it's used.
Upstream-commit: ce53e21ea6790cf7c2e96f8c5f0725bdf41a80f0
Component: engine
2013-09-01 16:12:07 -07:00
c12e034929
Merge branch 'login_signal' of https://github.com/calavera/docker into login_signal
...
* 'login_signal' of https://github.com/calavera/docker :
Use flag.StringVar to capture the command line flags.
Fix syscall name.
Remove unused imports.
Simplify term signal handler.
Add the ISIG syscall back to not kill the client withing a shell with ctrl+c.
Print a new line after getting the password from stdin.
Exit if there is any error reading from stdin.
Stop making a raw terminal to ask for registry login credentials.
Allow to generate signals when termios is in raw mode.
Use a more idiomatic syntax to capture the exit.
Exit from `docker login` on SIGTERM and SIGINT.
Upstream-commit: 35fef275b3978a22d0e285cd7fa554b4447e6958
Component: engine
2013-09-01 16:10:53 -07:00
493d150712
Merge branch 'master' into login_signal
...
* master: (23 commits)
Made calling changelog before run return empty. Fixes #1705 .
fix error in docker build when param is not a directory
Document FROM <image>:<tag> Dockerfile instruction.
Install Ubuntu raring backported kernel from official archives directly.
Updated "Use -> The Basics" to use ubuntu:12.10.
hide version when not available
added a Dockerfile which installs all deps and builds the docs.
Unable to find image error should print to stderr
remove message during tests
use init function
add TEST env var during tests and silenced parserun during tests
Update python_web_app.rst
Update remaining upstart scripts to wait for lxc-net
Fixed a minor syntax error.
Add privileged flag in documentation for container creation
Fix #1685 : Notes on production use. General installation cleanup.
Fix bash completion, remove have
added apt-key finger tip and fingerprint in ubuntu installation page
Improve formatting with 'go fmt' as stated in CONTRIBUTING.md
Start docker after lxc-net to prevent ip forwarding race
...
Upstream-commit: fa3266efa553940b0b4a56f008bbe8634650d5ae
Component: engine
2013-09-01 15:56:59 -07:00
1ab9b24f1c
Added NodeJS library
...
Upstream-commit: e42d3a1bfaa555c68cb4a45a2272f8ebf5a3782b
Component: engine
2013-08-31 22:13:15 -04:00
35ab6e6649
Merge pull request #1665 from dotcloud/ksid-contrib-maintainer
...
Make Kawsar Saiyeed @KSid the maintainer for contributed tools
Upstream-commit: 3528990c73e7457aad12093837c51a17fc99b82a
Component: engine
2013-08-30 17:07:03 -07:00
d95a8ab02c
Merge pull request #1704 from dhrp/ubuntu-install-finger-fingerprint
...
added apt-key finger tip and fingerprint in ubuntu installation page
Upstream-commit: 8ee4473d923eb5fc098e3ef27c8b83397c1ea492
Component: engine
2013-08-30 16:15:19 -07:00
40fb0d73cb
Merge pull request #1673 from xdissent/1659-upstart-order
...
Start docker after lxc-net to prevent ip forwarding race
Upstream-commit: 212b582362e66fc0d9403c0b8c46022f5d103224
Component: engine
2013-08-30 16:05:40 -07:00
69521a9731
Merge pull request #1752 from dotcloud/1750-build_error-fix
...
fix error in docker build when param is not a directory
Upstream-commit: 969e48dd5a7c6969c9169c654aef8557ea860bd5
Component: engine
2013-08-30 16:05:23 -07:00
a0c755cc01
Merge pull request #1754 from griff/1705_changelog_fails_before_run
...
- Runtime: Made calling change log before run return empty list.
Upstream-commit: d9b7ec64584f16af4d97fe1a2d26404b8bdd0c34
Component: engine
2013-08-30 16:02:46 -07:00
77d05d40bc
Made calling changelog before run return empty. Fixes #1705 .
...
Upstream-commit: 46c9c5c84317907153f06284dc5110b53a0fbf3c
Component: engine
2013-08-30 22:46:07 +02:00
8468ddcf8f
Merge pull request #1613 from thijsterlouw/proper_resolvconf_parsing
...
Proper resolv.conf parsing
Upstream-commit: 84431ec03c08f0d8ce8f9385aa1b709a28fef1f3
Component: engine
2013-08-30 12:10:45 -07:00
01ba35b8f8
fix error in docker build when param is not a directory
...
Upstream-commit: d605e82badf64c3033f5f26199285aed414f63dd
Component: engine
2013-08-30 18:08:29 +00:00
70b7f9ce72
Merge pull request #1744 from dsissitka/patch-7
...
Updated "Use -> The Basics" to use ubuntu:12.10.
Upstream-commit: 2ea19238ff0565560a1a0aee62a26cd9e8d1fe72
Component: engine
2013-08-30 10:44:54 -07:00
3c526358a5
Merge pull request #1749 from msiebuhr/doc-from-tags
...
Document FROM <image>:<tag> Dockerfile instruction.
Upstream-commit: df36f9db058f684adef5f46c891661509cd770f3
Component: engine
2013-08-30 10:44:36 -07:00
