Commit Graph

31631 Commits

Author SHA1 Message Date
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
5e9efb8def Don't export Graph.walkAll.
Upstream-commit: 113bb396cdef5e07a19306dea767870b2775214d
Component: engine
2013-08-31 20:44:49 -07:00
c7e2ec175d Replace Graph.All with Graph.Map
Upstream-commit: 1fca99ad908c530fcd03158a56767b55500a8521
Component: engine
2013-08-31 20:44:42 -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
8de9407f39 Copies content from image to volumne if non-empty. Fixes #1582.
Upstream-commit: 7a9c71183212a40fdd10369d009a9f97b56fe359
Component: engine
2013-08-30 22:02:05 +02:00
4fa9c87644 Just fixing gofmt issues in other people's code.
Upstream-commit: 6756e786ac36d4e5cda46541b5d6e0b2913b6997
Component: engine
2013-08-30 22:02:05 +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
f1d90b21c4 Merge pull request #1738 from jonasi/error-to-stderr
Unable to find image error should print to stderr
Upstream-commit: 74982bda32d99e02c0ce9a34371fe0cf6ef1d208
Component: engine
2013-08-30 10:43:45 -07:00
10eb2e6feb Merge pull request #1743 from dotcloud/fix_version
Hide version when not available
Upstream-commit: 6d769f4b9b94804bd10a7774ae0dd61266096895
Component: engine
2013-08-30 10:39:48 -07:00
cc50e6bf4b Document FROM <image>:<tag> Dockerfile instruction.
Upstream-commit: 1a8a540209c997f5e75a476b942365aad892ad35
Component: engine
2013-08-30 15:23:32 +02:00
0489287cce Install Ubuntu raring backported kernel from official archives directly.
Upstream-commit: 6c206f7d7835310c39ef20d3375e949b1fbfd7b9
Component: engine
2013-08-30 14:12:13 +08:00
f5f5103119 Merge pull request #1736 from ramonvanalteren/patch-1
Update python_web_app.rst
Upstream-commit: 110d3b77949de024c5eb3263fd06f7d819a90682
Component: engine
2013-08-29 18:36:53 -07:00
02ce80c747 Updated "Use -> The Basics" to use ubuntu:12.10.
ubuntu:latest doesn't have nc. ubuntu:12.10 does.
Upstream-commit: c0e95fa68a37166ce551a33332bbede6b6531b68
Component: engine
2013-08-29 21:05:18 -04:00
b0c69b2fc0 hide version when not available
Upstream-commit: e3b58d302795fbbfa6c117774906a4c9efd536f4
Component: engine
2013-08-30 00:46:43 +00:00
952e5b8400 Merge pull request #1739 from dotcloud/add-docs-dockerfile
Added a Dockerfile which installs all deps and builds the Docs
Upstream-commit: 9b029a08549e2fef8f71115e5707c363368662e9
Component: engine
2013-08-29 17:42:17 -07:00
80e56036a6 Merge pull request #1690 from jbbarth/code-formatting
go fmt
Upstream-commit: 49d35cc0aed060288a1db8bbb6e23b3c6f7178fc
Component: engine
2013-08-29 17:13:37 -07:00
a659202877 added a Dockerfile which installs all deps and builds the docs.
Upstream-commit: c6702bebe116054a4c24487b5fb5d2c26e9fad4f
Component: engine
2013-08-30 00:13:32 +00:00
af73da6c24 Merge pull request #1710 from thomasf/master
Fix bash completion.
Upstream-commit: 690c3839fde3ea143dbaccacb1b618840e6a02f0
Component: engine
2013-08-29 17:08:14 -07:00
27d052d30a Merge pull request #1721 from andrewmunsell/patch-2
Add privileged flag in documentation for container creation
Upstream-commit: 050cf701369feb8e90fda98b6f4b25a335c741d6
Component: engine
2013-08-29 17:05:40 -07:00
b0e3c64e68 Merge pull request #1591 from dotcloud/1557_fix_docker_run_useage
add TEST env var during tests and silenced parserun during tests
Upstream-commit: df8f95ac744d5c83031aabdc464447d9cf102e41
Component: engine
2013-08-29 16:51:34 -07:00
1257529085 Merge pull request #1729 from dsissitka/patch-6
Fixed a minor syntax error.
Upstream-commit: 0f91418b260375902430d7b057c6cfd8a07488db
Component: engine
2013-08-29 16:27:22 -07:00
cb31b917c6 Unable to find image error should print to stderr
Upstream-commit: 4ff649ce852175f209c27d03992f31b5f14cae65
Component: engine
2013-08-29 18:25:11 -05:00
6e525e067e Merge pull request #1717 from metalivedev/1685-updateinstallation
Fix #1685: Notes on production use. General installation cleanup.
Upstream-commit: c4394decf85ab1428edab61edeb73e6cf65b61ce
Component: engine
2013-08-29 16:06:00 -07:00
068b4e2c39 remove message during tests
Upstream-commit: f159f4710b0c5dac8b71246dddbaee667dd6a702
Component: engine
2013-08-29 22:59:34 +00:00
6b54138e54 use init function
Upstream-commit: 740a97f1a836be17ab39e8496b7372900782c20b
Component: engine
2013-08-29 22:55:29 +00:00
d89a877aeb add TEST env var during tests and silenced parserun during tests
Upstream-commit: eee6d3dae96afbcb1456b4a84f05f1aac44e5598
Component: engine
2013-08-29 22:55:29 +00:00
a42573ca6a Update python_web_app.rst
Fixed typo in the WEB_PORT command, missing sudo in front of docker command
Upstream-commit: 559724ac35134ac3cced1159cf776b7ab7bdacc6
Component: engine
2013-08-30 00:37:47 +02:00
6f14a61b9c Update remaining upstart scripts to wait for lxc-net
Upstream-commit: 3f141e1fd3a11507b049359ea59253b49395d494
Component: engine
2013-08-29 14:06:24 -05:00
7d1c223c01 Use flag.StringVar to capture the command line flags.
Upstream-commit: 9f8e5a93b4b7c6b190177c73085e7d2d2d93c64b
Component: engine
2013-08-29 11:46:42 -07:00
ac027697b1 Fix syscall name.
Upstream-commit: 78d995bbd6dc8022faef251835ae6001c4c3da49
Component: engine
2013-08-29 11:46:42 -07:00
7f0d8ec01e Remove unused imports.
Upstream-commit: e7ee2f443ad93803e8312bc224da618d555aebdc
Component: engine
2013-08-29 11:46:42 -07:00
ea51b25ef3 Simplify term signal handler.
Upstream-commit: b8a89628339dd63b5f2ff3d28715a5431412b65a
Component: engine
2013-08-29 11:46:42 -07:00
f6009b13bb Add the ISIG syscall back to not kill the client withing a shell with ctrl+c.
Upstream-commit: b54ba5095bc8b9323a3649806df98345cbe1f3b0
Component: engine
2013-08-29 11:46:41 -07:00
13f0cfba56 Print a new line after getting the password from stdin.
Upstream-commit: f18889bf674e574a3ac1315ed7bbd56bf638e6c5
Component: engine
2013-08-29 11:46:41 -07:00
97484172e8 Exit if there is any error reading from stdin.
Upstream-commit: 6e4a818ee65008a043d3ba8e5053cc43babb2f66
Component: engine
2013-08-29 11:46:41 -07:00
1d2e8a4a7e Stop making a raw terminal to ask for registry login credentials.
It only disables echo asking for the password and lets the terminal to handle everything else.
It fixes #1392 since blank spaces are not discarded as they did before.
It also cleans the login code a little bit to improve readability.
Upstream-commit: 2357fecc92c57e2fcd4a37c60d713508210358f7
Component: engine
2013-08-29 11:46:41 -07:00
b37c48f450 Allow to generate signals when termios is in raw mode.
Upstream-commit: 23dc52f52804219bd57b34217d8778bda0444f13
Component: engine
2013-08-29 11:45:04 -07:00