Commit Graph

2744 Commits

Author SHA1 Message Date
8ed0b7d24b Some fixes for MongoDB example
Upstream-commit: d6f53049c4ec4513a136bfd512dafe166c4ad901
Component: engine
2013-08-21 23:48:32 -04:00
6f9dbd0830 Merge pull request #1596 from metalivedev/1149-easyfixes
Fix #1330 and #1149. Improve CMD, ENTRYPOINT, and attach docs.
Upstream-commit: 0b9c8e286050bd7bc21e15085b34ed9779080ce6
Component: engine
2013-08-21 14:06:41 -07:00
7c2919c17f Merge pull request #1614 from denibertovic/docs
Small fix to docs regarding adding docker groups
Upstream-commit: 42fe550c9eb570adc2aedfcc8c5ceb62388f14e4
Component: engine
2013-08-21 12:26:56 -07:00
934a8f1946 Add mongodb example
Upstream-commit: f5bd13721666366879e3a9681df8442181448ffc
Component: engine
2013-08-21 12:09:40 -07:00
0398c9c138 Merge pull request #1607 from TylerBrock/mongodb
Add MongoDB image example
Upstream-commit: 348696f3fe88fbae1a1c15d34fe09398e73f6897
Component: engine
2013-08-21 12:07:50 -07:00
29acb4a3dc Merge pull request #1513 from dotcloud/add_user_dockerfile
Add USER instruction do Dockerfile
Upstream-commit: 6da071985f5500d10122d5ce59a2764377652c2f
Component: engine
2013-08-21 09:19:31 -07:00
8a0c775435 Merge pull request #1588 from dotcloud/1561_fix_warning_in_tests
assume ip_forwarding = 1 by default
Upstream-commit: 56e02dd0c7f1eac50d05d272d8f597a79a370ab7
Component: engine
2013-08-21 09:15:23 -07:00
9e0921e842 Merge pull request #1576 from MatthewMueller/patch-1
updated default -H docs
Upstream-commit: e0a7013836e9302a5181f1e78ed6b9310b5eeac6
Component: engine
2013-08-21 09:09:43 -07:00
c79c5213b2 small fix to docs regarding adding docker groups
Upstream-commit: 467dbb75f10ae97e785a127a7547a5015cbb2a99
Component: engine
2013-08-21 17:28:13 +02:00
7440fa2394 update help
Upstream-commit: 215094903a9574953af915f5b93c89858d626473
Component: engine
2013-08-21 02:08:32 -07:00
0957301291 add mongodb image example
Upstream-commit: 2c147dd721c5a92fa86af0ab4a6b9b9ebcd8d546
Component: engine
2013-08-20 18:08:15 -04:00
ac774c5f65 rebase docs
Upstream-commit: f69c4652314064a2e676220ef8e137e8499ce3b8
Component: engine
2013-08-20 11:42:53 +00:00
2524368b0f Fix #1330 and #1149. Improve CMD, ENTRYPOINT, and attach docs.
Upstream-commit: 75f4fd978d234efbc3a5c5c55ea162a9a68246d9
Component: engine
2013-08-19 19:13:26 -07:00
09d848fbf1 Merge pull request #1590 from elmendalerenda/patch-3
fixed postgresql conf setting
Upstream-commit: d627ff969735d44201fc88539d388ad87f102cda
Component: engine
2013-08-19 10:27:43 -07:00
20388436a9 Merge pull request #1396 from calavera/985-ordered-api-images
Sort APIImages by most recent creation date.
Upstream-commit: 04c16f347bd7fc6f361debc7c0cddcde06aa56ba
Component: engine
2013-08-19 09:41:39 -07:00
a77ffeddfa Merge pull request #1581 from mhennings/workdirsupport-buildfile
Add workdir support for the Buildfile
Upstream-commit: 9c829cb5b4b0a06cb4264f77c0582731594bf1b5
Component: engine
2013-08-19 09:18:22 -07:00
9fa228bf68 fixed postgresql conf setting
small typo, changed listen_address to listen_addresses
Upstream-commit: 83acd37161ed7149843546a779a95fdaf3e2458f
Component: engine
2013-08-19 14:20:25 +01:00
9fd5016532 assume ip_forwarding = 1 by default
Upstream-commit: b21f89862076397b63eb3ac4a19b9125b6f6477a
Component: engine
2013-08-19 12:34:30 +00:00
03e9994efc Merge pull request #1553 from dotcloud/1540_fix_error_message
fix can't connect message with socket
Upstream-commit: f6653c3fa55dc4e0595fc8d3904bd5873f317441
Component: engine
2013-08-19 05:06:21 -07:00
0c286d916a Add workdir support for the Buildfile
For consistency the Buildfile should have the option to
set the working directory.

Of course that is one option more to the buildfile,
so please tell me if we really want this to happen.
Upstream-commit: 319988336ceed4428de0e1e55685f8a0ed48a7bd
Component: engine
2013-08-18 20:30:19 +02:00
35c6bf7330 Add an option to set the working directory.
This makes it possible to simply wrap a command inside a container. This makes
it easier to use a container as an unified build environment.

Examples:

~/workspace/docker
$ docker  run  -v `pwd`:`pwd` -w `pwd` -i -t  ubuntu ls
AUTHORS		 Makefile	archive.go	   changes.go	      docker
[...]


docker  run  -v `pwd`:`pwd` -w `pwd` -i -t  ubuntu pwd
/home/marco/workspace/docker
Upstream-commit: 687d27ab575778196ea646b6d3fa61b6c8e512b0
Component: engine
2013-08-18 19:34:01 +02:00
2845552dec Sort images by tag name when the creation date is the same.
This establishes a strict alphabetical order for tags with the same creation date.
Upstream-commit: e6affb1b1ac0a172ce345d14162f6944ec68da4e
Component: engine
2013-08-17 22:11:34 -07:00
9a03ff28c0 add to cli
Upstream-commit: f409c119168b145157ff5329fd10ad0a8725d341
Component: engine
2013-08-17 22:10:06 -07:00
d4bbe3167c updated default
Upstream-commit: 5325703c2758b394de3e12723dd8dc89b1df9b29
Component: engine
2013-08-17 21:54:10 -07:00
caadb4bcda Show tag used when image is missing
Upstream-commit: 07a887032af78e5014d635f7e1d669d49b50894d
Component: engine
2013-08-17 20:03:54 -07:00
5293419556 Merge pull request #1550 from dotcloud/update-dependencies-in-readme
Update readme with dependencies for building
Upstream-commit: 1843a719117daff94b642e2e4a5b7a5db9e3fd6b
Component: engine
2013-08-16 17:46:25 -07:00
5f40dd8383 testing, issue #1431: Temporarely disable TestContainerTop from the testsuite
Upstream-commit: 422d4afdd544656c847ecd4c62a6965d5974eba5
Component: engine
2013-08-16 14:47:39 -07:00
2a164a3079 Merge pull request #1569 from TylerBrock/patch-1
Add instructions for creating and using the docker group
Upstream-commit: 09a08e0a9f17864f5740970a715de836aff8babb
Component: engine
2013-08-16 14:30:00 -07:00
a51aec19e0 registry: removing opaqueRequest
Upstream-commit: 0418702cfc69f3d748c7c8b00da467154944b540
Component: engine
2013-08-16 19:33:59 +02:00
7830299d44 remove extraneous step and stupid whitespace
Upstream-commit: 674e5c850374fffa03fb205ae6b623ec069978d9
Component: engine
2013-08-16 13:30:54 -04:00
e204ad6458 Add instructions for creating and using the docker group
Upstream-commit: 2ec141da542ab7563c7104b3a950bc503e4959fb
Component: engine
2013-08-16 13:19:59 -04:00
bb7828b2e8 Update readme with dependencies for building
Closes #915
Upstream-commit: bca19a22c50d3ff085c8d7accf35d35e6dde4d6a
Component: engine
2013-08-15 17:26:07 +00:00
20b48ace76 fix can't connect message
with socket
Upstream-commit: 62b45f08278ef283b91cc91761a25f5ceca16136
Component: engine
2013-08-15 13:48:08 +00:00
6fda0862e2 hot fix display in parallel pull and go fmt
Upstream-commit: d7979ef2d0044dc7def9238f0a1aed909f0590bb
Component: engine
2013-08-15 11:42:40 +00:00
5c27340e61 Merge pull request #1495 from bdon/master
Fix Graph ByParent() to generate list of child images per parent image.
Upstream-commit: c5d8844d80e2c1ec3021662dd97e6a812a922258
Component: engine
2013-08-14 20:42:34 -07:00
cff1278317 Add imagename to LogEvent tests
Upstream-commit: 7f9ba14b18e171589a82e8dd3bd084ece3405f83
Component: engine
2013-08-14 23:43:43 +00:00
e0d5a9b2e0 Merge pull request #1537 from metalivedev/1517-sudodocker
Fix #1517, #1521 by adding sudo to examples and installation.
Upstream-commit: 72660a1a2f8a51fbfb8ccb283f110d84ed1b9939
Component: engine
2013-08-14 16:34:00 -07:00
fd36c14020 Fix #1517, #1521 by adding sudo to examples and installation.
Upstream-commit: d4eab77f0c604e10f63519833dc25fbd5a3419bf
Component: engine
2013-08-14 16:21:36 -07:00
36aa33727b Merge pull request #1538 from KSid/bash-completion-limit-containers
Bash Completion: Limit commands to containers of a relevant state
Upstream-commit: 9708597b0b1b5d7bccf26e038091215e82b3edfe
Component: engine
2013-08-14 16:16:25 -07:00
951194f6f0 Merge pull request #1505 from dotcloud/improve_events
Add image name in /events
Upstream-commit: 15bc2240ac56a3f584bdc33865c896bac961c6a3
Component: engine
2013-08-14 15:40:36 -07:00
9147a2b4d7 Merge pull request #1496 from xdissent/1351-volumes-from-before-volumes
* Runtime: Apply volumes-from before creating volumes
Upstream-commit: 631c4491838e982697f596518f588fda5f9ae73d
Component: engine
2013-08-14 15:10:41 -07:00
390a4fe630 Merge pull request #1249 from unclejack/507-add_sigterm_sigint_handling_to_docker_run
#507 - make docker run handle SIGINT/SIGTERM
Upstream-commit: 84a0274885276e33921b378df79819c5f2108f67
Component: engine
2013-08-14 15:00:19 -07:00
9457b97e76 Merge pull request #1541 from dotcloud/1528-fix_panic
prevent crash when .dockercfg not readable
Upstream-commit: 5ad884002410ac94a8f4e36782580e7ad2f111fd
Component: engine
2013-08-14 14:51:01 -07:00
59b6e4bc04 Merge pull request #1543 from dotcloud/fix_rmi_parse_repo_tag
add missing ParseRepositoryTag
Upstream-commit: 8dfc47307d4d26f8c518de6746d5da96dab27c9b
Component: engine
2013-08-14 14:42:41 -07:00
b264e1d047 Merge branch 'master' of https://github.com/dotcloud/docker
Upstream-commit: aae04def7bc9b9d7167a3fe107cf5ea5746f5a87
Component: engine
2013-08-14 23:32:56 +02:00
7509b38aa2 Merge branch 'master' of https://github.com/dotcloud/docker
Upstream-commit: 8b6b187a8d205e81f50a3bfd114f1b33b985747b
Component: engine
2013-08-14 23:31:58 +02:00
ac3e60cfb0 brew: docker-py requirement points to git repository
Upstream-commit: 8b26e4ea3c92748a96b90fa245ccce7c7eebb81c
Component: engine
2013-08-14 23:31:18 +02:00
b9d5c15d6d testing, issue #1542: Add docker dependencies coverage testing into docker-ci
Upstream-commit: 1d8562b290d636c61aba13e8148963210c5f89aa
Component: engine
2013-08-14 14:27:46 -07:00
9defd8d614 Merge pull request #1478 from jpetazzo/929-insecure-flag
add -privileged flag and relevant tests, docs, and examples
Upstream-commit: 9662f9e56adeb92d3749c12bc1ce08928bbfc54b
Component: engine
2013-08-14 13:55:18 -07: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